From patchwork Wed Jun 8 07:40:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Binoy Jayan X-Patchwork-Id: 69584 Delivered-To: patch@linaro.org Received: by 10.140.106.246 with SMTP id e109csp2355772qgf; Wed, 8 Jun 2016 00:42:09 -0700 (PDT) X-Received: by 10.36.227.129 with SMTP id d123mr1494095ith.18.1465371728693; Wed, 08 Jun 2016 00:42:08 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id op3si17563051pac.193.2016.06.08.00.42.08; Wed, 08 Jun 2016 00:42:08 -0700 (PDT) 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; dkim=pass header.i=@linaro.org; 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; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756131AbcFHHmC (ORCPT + 31 others); Wed, 8 Jun 2016 03:42:02 -0400 Received: from mail-pa0-f53.google.com ([209.85.220.53]:33281 "EHLO mail-pa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756014AbcFHHlO (ORCPT ); Wed, 8 Jun 2016 03:41:14 -0400 Received: by mail-pa0-f53.google.com with SMTP id ec8so51065pac.0 for ; Wed, 08 Jun 2016 00:41:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=EdvYCgSRl6Bn+x97LRSUltu+ZYkEj3u4BUdCGAC+mrE=; b=PRKRdmWnYHFFXFAugTjmXykySNNjXoL7E63xItfXe9VmGO8XHG2zHGit57a/iB+6kN NF9DMjEWyA4SGGu8kmJ6B7YziroV6xxig1vU6/5DzGiwETo78R8xeFrKxQQrqe75bSNd drtwQm3hrpcLYwlX/sIXipK8PWiHU06W/C4qc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=EdvYCgSRl6Bn+x97LRSUltu+ZYkEj3u4BUdCGAC+mrE=; b=IaMVnBnTQIDMCc2BuW+6hWchGXblJ9rTozeWGVFCti/2OTRJnrYSajKWQ9BzICN29h R6T0Q3xzGYQA/tSCbaR0xTW8ySfJYe7RNBrIJXZIhQcp01pasPTN33azrh41gMZl6XWF NhAwxQ5XTcW0IlaKdVqX9D1b0IGoQsoGlDoORP4NeYNFXNsSbDXG9nY+v3tutc46YN1b fHRYqKToektZjQjwImJT1Ji767f/uYgUNuOoQctYfkTuRVE6/oEUuUl/ABcOIEXGq3Ij uPVu+poVdz5XJ9VIUk/FB2VfTVYF1H/FNQPwXpNVbO+XSDBHgFoVjrvzMbAHVqfRRspm GLlw== X-Gm-Message-State: ALyK8tJBQOHUXVR3QuRz2UViRKwWuGSJNDZxeogLhis+yvmLHXKtUjHQ93SkF/sg/KyjKyVL X-Received: by 10.66.134.2 with SMTP id pg2mr4259559pab.78.1465371673664; Wed, 08 Jun 2016 00:41:13 -0700 (PDT) Received: from blr-ubuntu-59.ap.qualcomm.com ([202.46.23.61]) by smtp.gmail.com with ESMTPSA id 189sm36621225pfd.18.2016.06.08.00.41.10 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 08 Jun 2016 00:41:13 -0700 (PDT) From: Binoy Jayan To: Greg Kroah-Hartman , Larry Finger , Jes Sorensen Cc: Arnd Bergmann , driverdev-devel@linuxdriverproject.org, linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, Binoy Jayan Subject: [PATCH 1/2] staging: r8723au: pwrctrl_priv: Replace semaphore lock with mutex Date: Wed, 8 Jun 2016 13:10:54 +0530 Message-Id: <1465371655-6768-2-git-send-email-binoy.jayan@linaro.org> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1465371655-6768-1-git-send-email-binoy.jayan@linaro.org> References: <1465371655-6768-1-git-send-email-binoy.jayan@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The semaphore 'lock' in pwrctrl_priv is a simple mutex, so it should be written as one. Semaphores are going away in the future. Signed-off-by: Binoy Jayan --- drivers/staging/rtl8723au/core/rtw_pwrctrl.c | 11 ++++++----- drivers/staging/rtl8723au/include/rtw_pwrctrl.h | 3 ++- drivers/staging/rtl8723au/os_dep/usb_intf.c | 11 ++++++----- 3 files changed, 14 insertions(+), 11 deletions(-) -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project diff --git a/drivers/staging/rtl8723au/core/rtw_pwrctrl.c b/drivers/staging/rtl8723au/core/rtw_pwrctrl.c index 7488a10..2d43958 100644 --- a/drivers/staging/rtl8723au/core/rtw_pwrctrl.c +++ b/drivers/staging/rtl8723au/core/rtw_pwrctrl.c @@ -14,6 +14,7 @@ ******************************************************************************/ #define _RTW_PWRCTRL_C_ +#include #include #include #include @@ -27,7 +28,7 @@ void ips_enter23a(struct rtw_adapter *padapter) { struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; - down(&pwrpriv->lock); + mutex_lock(&pwrpriv->mutex_lock); pwrpriv->bips_processing = true; @@ -50,7 +51,7 @@ void ips_enter23a(struct rtw_adapter *padapter) } pwrpriv->bips_processing = false; - up(&pwrpriv->lock); + mutex_unlock(&pwrpriv->mutex_lock); } int ips_leave23a(struct rtw_adapter *padapter) @@ -61,7 +62,7 @@ int ips_leave23a(struct rtw_adapter *padapter) int result = _SUCCESS; int keyid; - down(&pwrpriv->lock); + mutex_lock(&pwrpriv->mutex_lock); if (pwrpriv->rf_pwrstate == rf_off && !pwrpriv->bips_processing) { pwrpriv->bips_processing = true; @@ -106,7 +107,7 @@ int ips_leave23a(struct rtw_adapter *padapter) pwrpriv->bpower_saving = false; } - up(&pwrpriv->lock); + mutex_unlock(&pwrpriv->mutex_lock); return result; } @@ -423,7 +424,7 @@ void rtw_init_pwrctrl_priv23a(struct rtw_adapter *padapter) { struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv; - sema_init(&pwrctrlpriv->lock, 1); + mutex_init(&pwrctrlpriv->mutex_lock); pwrctrlpriv->rf_pwrstate = rf_on; pwrctrlpriv->ips_enter23a_cnts = 0; pwrctrlpriv->ips_leave23a_cnts = 0; diff --git a/drivers/staging/rtl8723au/include/rtw_pwrctrl.h b/drivers/staging/rtl8723au/include/rtw_pwrctrl.h index 599fed9..699b9f3 100644 --- a/drivers/staging/rtl8723au/include/rtw_pwrctrl.h +++ b/drivers/staging/rtl8723au/include/rtw_pwrctrl.h @@ -15,6 +15,7 @@ #ifndef __RTW_PWRCTRL_H_ #define __RTW_PWRCTRL_H_ +#include #include #include @@ -149,7 +150,7 @@ enum { /* for ips_mode */ }; struct pwrctrl_priv { - struct semaphore lock; + struct mutex mutex_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 diff --git a/drivers/staging/rtl8723au/os_dep/usb_intf.c b/drivers/staging/rtl8723au/os_dep/usb_intf.c index cf83eff..fa7dda5 100644 --- a/drivers/staging/rtl8723au/os_dep/usb_intf.c +++ b/drivers/staging/rtl8723au/os_dep/usb_intf.c @@ -14,6 +14,7 @@ ******************************************************************************/ #define _HCI_INTF_C_ +#include #include #include #include @@ -291,7 +292,7 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message) rtw_cancel_all_timer23a(padapter); LeaveAllPowerSaveMode23a(padapter); - down(&pwrpriv->lock); + mutex_lock(&pwrpriv->mutex_lock); /* padapter->net_closed = true; */ /* s1. */ if (pnetdev) { @@ -321,7 +322,7 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message) rtw_free_network_queue23a(padapter); rtw_dev_unload(padapter); - up(&pwrpriv->lock); + mutex_unlock(&pwrpriv->mutex_lock); if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)) rtw_cfg80211_indicate_scan_done( @@ -353,20 +354,20 @@ static int rtw_resume(struct usb_interface *pusb_intf) pnetdev = padapter->pnetdev; pwrpriv = &padapter->pwrctrlpriv; - down(&pwrpriv->lock); + mutex_lock(&pwrpriv->mutex_lock); rtw_reset_drv_sw23a(padapter); pwrpriv->bkeepfwalive = false; DBG_8723A("bkeepfwalive(%x)\n", pwrpriv->bkeepfwalive); if (pm_netdev_open23a(pnetdev, true) != 0) { - up(&pwrpriv->lock); + mutex_unlock(&pwrpriv->mutex_lock); goto exit; } netif_device_attach(pnetdev); netif_carrier_on(pnetdev); - up(&pwrpriv->lock); + mutex_unlock(&pwrpriv->mutex_lock); if (padapter->pid[1] != 0) { DBG_8723A("pid[1]:%d\n", padapter->pid[1]);