From patchwork Mon Dec 10 21:40:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 153364 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp4043926ljp; Mon, 10 Dec 2018 13:40:51 -0800 (PST) X-Google-Smtp-Source: AFSGD/VgyL1EFD6hZwJXoZ3W0dGmVsEWVbmLHwvloLuq9qx9v7nb05ZIOQa2+FqmFbSsnND1//qq X-Received: by 2002:a17:902:6b83:: with SMTP id p3mr13532108plk.118.1544478051371; Mon, 10 Dec 2018 13:40:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544478051; cv=none; d=google.com; s=arc-20160816; b=igvlP7XDX1BgvOnltt5UcSr8cXpYZClHnkHTmHPCVTXaPz5CEVaTYLg8Qai6huTCNX efmzzIVki+jqm5xiXe06wUBM7YXWlumJ3lLnDcOY5hB+yjNyGlSQHc1eAYL3tufEIfxh XJubez4cEz2qprrwINZWv2N3u3XkvY/nM8o4N7YU+Mzjzmzl6DzIt1UcMYcOZKYZfcVI b+ENunUIP1tD/DWEUvihFEGpfVpIxbJ2WyCR9SrXDxPYHOsX5iAj82AtllXrM1KSD4fF D4xt/hDIjEsgEbbqcSSIzurMh0eVcWAMS+VlCXSfmbO1XIhj/85yTDOn/fBcbjtI0ur5 zVBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=ZakXBNEldyrZlxSM2U5f4AAbqCQgYQIYURGpUN6iiag=; b=eMLwqIGUNQGTIhtflvs/AfZJ4e1Rz+Pfs9ei/mVx4sRFNfhl/INPmWyZk1+kjSpNay BeYbIxM2YstMGGR4f4CYlITPCgmtskCAR4/OyLyAElUP58XZIIxB8LGhlE/o9SOb15FA YKLuEsSvsVKmLxUEDAWb8TG4qQpaiOxnulVUWTA9ZPLsJFA/yoomMA3znKhu7g7o84sS OBb4X9P0WQMy64o2RFkiytV9H3cEOXk42kMi6kQ7qY0MjIw48T1623t/cg4LGFd+Q8sO wwN/TT3L5ZQ7RAtJQBhhNThlY4coWQTeORhZNQiz5L7cw5s/6CExOSa9z7OcINyFopir I9hg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t16si12226052pfk.139.2018.12.10.13.40.51; Mon, 10 Dec 2018 13:40:51 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729694AbeLJVks (ORCPT + 31 others); Mon, 10 Dec 2018 16:40:48 -0500 Received: from mout.kundenserver.de ([212.227.17.13]:40459 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727225AbeLJVks (ORCPT ); Mon, 10 Dec 2018 16:40:48 -0500 Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.145]) with ESMTPA (Nemesis) id 1MKt3r-1gkxju2shR-00LBkS; Mon, 10 Dec 2018 22:40:39 +0100 From: Arnd Bergmann To: Greg Kroah-Hartman Cc: Bastien Nocera , Hans de Goede , Larry Finger , linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org, Arnd Bergmann Subject: [PATCH 3/3] staging: rtl8723bs: remove semaphore remnants Date: Mon, 10 Dec 2018 22:40:32 +0100 Message-Id: <20181210214032.1441224-3-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20181210214032.1441224-1-arnd@arndb.de> References: <20181210214032.1441224-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:UIWJreOK1DoDOD+HihI3f0vtdhFbCYFZJ4q6s5/HZGs0VyhXOg9 3DrLSI6S6dV8t0UzJg5i11Cw9IymXEVLzrcCjTBAufK1SvWGUYBpevx78jxbpULuvtZSJGn Up6ZlPf/k2CMgVemonZTUnz0R05mj7Tivz7BrfuYi/CxTzS/ygj6XgGNBPiC59l/9G49Ee9 xNF9XKFRr2/AXvNQanpaw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:mThaKqYdTIY=:7vcTxszwHksxVdQ0ydQ3qZ qmgo7dTQG+kGnPApNf3PB9xs/rrZ+rgM8/+o9iV2Em7gB3LMzxUy2ZtN3MRWys4htioSdgCB5 TS39eKWyrrPmS62IpPgFlpoUmmQ/2dH+HmsVjTk6E0Jy8qfghJtEa7UDtlJ/Q1jhbNJeQUJ2G E5jppVR0rUVk5DFK9W93NpG7WEq9LecYpuUe7lp+OTIQrR6w/E4mWmkXnBbhiPyBOuC8vX6VK L9jJSpUiglzRkpNFJGmp0d221YsW1USW1RDC5clcNjDcan66IVjlnZj7Rq02HhD0TCF8EMmNJ dKb3B0pntqbj56fcJZbGgvjxHSWdX29hxOa+/4/uYhqwmpXjNqEvdGnEkCXj8AOPusyGmYQdX T2MxdOOx1xkMSJWhyXcgNxpw8dPx5VWf7l5qRULC/yDRRN0tgPJo4Ms8e8pwco6nymEysxTjC In9jMgvwxEemnqDDEiH9kRvrKSX0tdcQbxZJdDQ1lGTWe7sWotD66CNMGIcsITbiz1sIlZpbM mATxq/s6LksHH8WnjAOfy1MrBFkxsA7RC35K5XIVKSWHGdCB+UVYssHq8bhDsBkPndnMDlhyb nqnuEH7IfK4YgHKo0mMLVB41f66OxGWOneIDrkdxIkrHNGCzZFbxfMcYcra+BVeqCjLYfQq22 SYlAzhQFcDvWhbn5W9WZCJJBXG9ytBAKJ70t8r5KYW3P1kq5datz1llo31Rz7YUWYBiXMlCOS DqWSSGFR5z4NQLtDqpXHVWI9U6jeuqPTQQUjoA== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Nothing uses the semaphores any more in this driver, so remove all references to that type. Signed-off-by: Arnd Bergmann --- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 1 - drivers/staging/rtl8723bs/include/osdep_service_linux.h | 2 -- drivers/staging/rtl8723bs/include/rtw_io.h | 1 - drivers/staging/rtl8723bs/include/rtw_mp.h | 1 - drivers/staging/rtl8723bs/include/rtw_pwrctrl.h | 5 ----- 5 files changed, 10 deletions(-) -- 2.20.0 diff --git a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c index b7dd5fec9b31..eb27522a5444 100644 --- a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c +++ b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c @@ -1126,7 +1126,6 @@ void rtw_init_pwrctrl_priv(struct adapter *padapter) struct pwrctrl_priv *pwrctrlpriv = adapter_to_pwrctl(padapter); mutex_init(&pwrctrlpriv->lock); - sema_init(&pwrctrlpriv->check_32k_lock, 1); pwrctrlpriv->rf_pwrstate = rf_on; pwrctrlpriv->ips_enter_cnts = 0; pwrctrlpriv->ips_leave_cnts = 0; diff --git a/drivers/staging/rtl8723bs/include/osdep_service_linux.h b/drivers/staging/rtl8723bs/include/osdep_service_linux.h index 58d1e1019241..2f1b51e614fb 100644 --- a/drivers/staging/rtl8723bs/include/osdep_service_linux.h +++ b/drivers/staging/rtl8723bs/include/osdep_service_linux.h @@ -22,7 +22,6 @@ #include #include #include - #include #include #include #include @@ -41,7 +40,6 @@ #include #include - typedef struct semaphore _sema; typedef spinlock_t _lock; typedef struct mutex _mutex; typedef struct timer_list _timer; diff --git a/drivers/staging/rtl8723bs/include/rtw_io.h b/drivers/staging/rtl8723bs/include/rtw_io.h index 4f8be55da65d..99d104b3647a 100644 --- a/drivers/staging/rtl8723bs/include/rtw_io.h +++ b/drivers/staging/rtl8723bs/include/rtw_io.h @@ -115,7 +115,6 @@ struct io_req { u32 command; u32 status; u8 *pbuf; - _sema sema; void (*_async_io_callback)(struct adapter *padater, struct io_req *pio_req, u8 *cnxt); u8 *cnxt; diff --git a/drivers/staging/rtl8723bs/include/rtw_mp.h b/drivers/staging/rtl8723bs/include/rtw_mp.h index 839084733201..bb3970d58573 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mp.h +++ b/drivers/staging/rtl8723bs/include/rtw_mp.h @@ -62,7 +62,6 @@ typedef struct _MPT_CONTEXT /* Indicate if the driver is unloading or unloaded. */ bool bMptDrvUnload; - _sema MPh2c_Sema; _timer MPh2c_timeout_timer; /* Event used to sync H2c for BT control */ diff --git a/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h b/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h index abf48ae01900..e2a4c680125f 100644 --- a/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h +++ b/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h @@ -94,10 +94,6 @@ struct reportpwrstate_parm { unsigned short rsvd; }; - -typedef _sema _pwrlock; - - #define LPS_DELAY_TIME 1*HZ /* 1 sec */ #define EXE_PWR_NONE 0x01 @@ -209,7 +205,6 @@ typedef struct pno_scan_info struct pwrctrl_priv { struct mutex lock; - _pwrlock check_32k_lock; volatile u8 rpwm; /* requested power state for fw */ volatile u8 cpwm; /* fw current power state. updated when 1. read from HCPWM 2. driver lowers power level */ volatile u8 tog; /* toggling */