From patchwork Wed Jun 1 09:26:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Binoy Jayan X-Patchwork-Id: 69004 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp2422090qge; Wed, 1 Jun 2016 02:28:02 -0700 (PDT) X-Received: by 10.98.71.81 with SMTP id u78mr6549957pfa.29.1464773278455; Wed, 01 Jun 2016 02:27:58 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d63si48221236pfc.180.2016.06.01.02.27.58; Wed, 01 Jun 2016 02:27:58 -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 S1757909AbcFAJ1q (ORCPT + 30 others); Wed, 1 Jun 2016 05:27:46 -0400 Received: from mail-pf0-f173.google.com ([209.85.192.173]:35196 "EHLO mail-pf0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757867AbcFAJ1o (ORCPT ); Wed, 1 Jun 2016 05:27:44 -0400 Received: by mail-pf0-f173.google.com with SMTP id g64so11850227pfb.2 for ; Wed, 01 Jun 2016 02:27:43 -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=cT910V2GiNhdoqt3LCrrXHYJQJZKvPwV4KiH4vV6LUc=; b=AkL3fCdEXgltJFe6Vx8QnG4tedTlpc0v/FkZ3KLdvNyi74r0fTi9HOGDLODprr6NBT Qh0j4IggM2+NFq1QHP2SBYOrEMAP6aZHb65ONOAN3Xwj/zn5pqhWY9eKg9ClycB8WkTI 3ZQFfMB1lwPfz0n2Lj/3JHmgePEQtB0qWrUaE= 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=cT910V2GiNhdoqt3LCrrXHYJQJZKvPwV4KiH4vV6LUc=; b=EWrnCczysXF4s7kDDejsXJCwCPdlf9o0My7yz0C9wvvBNr2Q7O0+2xDooPhDo3qF9/ QfmaslcQs7r+akFsgxW1aqpTITEJkipF2vPrFCPuH/tlcpBG3xKZ2kkzhha/kiR5O4Lc 6Gvd0UW+O0MbUX2gd5/4XVez/gvSYe3QS67zemmjXaGpLw4vr5vtuy0rXhM7S0EqMUOi BnPB4UFaGKV+F22Tg0Eoztgr7EcVEj+j2H9WZB61ftbn6R43SjpMk1FztFUSCLlSR8Oc unhIG78JeJDI6v6XOwjUsatTXwzfL3E3W5P3/nCBtn8J6RMv0RFZ1FgkL7SZjlMyDp+K QvWA== X-Gm-Message-State: ALyK8tJThatfxuN4A+LRfwHo41hDWHYQBiIdkeqwx0KXEZ4gwx5wFOzZ0xG1r+mCM/8XP+4l X-Received: by 10.98.7.154 with SMTP id 26mr6778325pfh.2.1464773258168; Wed, 01 Jun 2016 02:27:38 -0700 (PDT) Received: from blr-ubuntu-59.ap.qualcomm.com ([202.46.23.61]) by smtp.gmail.com with ESMTPSA id b67sm46398155pfc.74.2016.06.01.02.27.35 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Jun 2016 02:27:37 -0700 (PDT) From: Binoy Jayan To: Greg Kroah-Hartman Cc: Arnd Bergmann , Mateusz Kulikowski , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Binoy Jayan Subject: [PATCH 4/5] rtl8192e: Replace semaphore scan_sem with mutex Date: Wed, 1 Jun 2016 14:56:55 +0530 Message-Id: <1464773216-32014-5-git-send-email-binoy.jayan@linaro.org> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1464773216-32014-1-git-send-email-binoy.jayan@linaro.org> References: <1464773216-32014-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 'scan_sem' in the rtl8192e is a simple mutex, so it should be written as one. Semaphores are going away in the future. Signed-off-by: Binoy Jayan --- This patch depends on the following patch: rtl8192e: Replace semaphore rf_sem with mutex drivers/staging/rtl8192e/rtllib.h | 2 +- drivers/staging/rtl8192e/rtllib_softmac.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index 513dd61..5bdc378 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1653,7 +1653,7 @@ struct rtllib_device { short proto_stoppping; struct mutex wx_mutex; - struct semaphore scan_sem; + struct mutex scan_mutex; struct semaphore ips_sem; spinlock_t mgmt_tx_lock; diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c index 30abb7f..7f4033c 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -513,7 +513,7 @@ static void rtllib_softmac_scan_syncro(struct rtllib_device *ieee, u8 is_mesh) ieee->be_scan_inprogress = true; - down(&ieee->scan_sem); + mutex_lock(&ieee->scan_mutex); while (1) { do { @@ -566,7 +566,7 @@ out: if (IS_DOT11D_ENABLE(ieee)) DOT11D_ScanComplete(ieee); } - up(&ieee->scan_sem); + mutex_unlock(&ieee->scan_mutex); ieee->be_scan_inprogress = false; @@ -587,7 +587,7 @@ static void rtllib_softmac_scan_wq(void *data) if (rtllib_act_scanning(ieee, true)) return; - down(&ieee->scan_sem); + mutex_lock(&ieee->scan_mutex); if (ieee->eRFPowerState == eRfOff) { netdev_info(ieee->dev, @@ -618,7 +618,7 @@ static void rtllib_softmac_scan_wq(void *data) schedule_delayed_work(&ieee->softmac_scan_wq, msecs_to_jiffies(RTLLIB_SOFTMAC_SCAN_TIME)); - up(&ieee->scan_sem); + mutex_unlock(&ieee->scan_mutex); return; out: @@ -630,7 +630,7 @@ out1: ieee->actscanning = false; ieee->scan_watch_dog = 0; ieee->scanning_continue = 0; - up(&ieee->scan_sem); + mutex_unlock(&ieee->scan_mutex); } @@ -683,7 +683,7 @@ EXPORT_SYMBOL(rtllib_start_send_beacons); static void rtllib_softmac_stop_scan(struct rtllib_device *ieee) { - down(&ieee->scan_sem); + mutex_lock(&ieee->scan_mutex); ieee->scan_watch_dog = 0; if (ieee->scanning_continue == 1) { ieee->scanning_continue = 0; @@ -692,7 +692,7 @@ static void rtllib_softmac_stop_scan(struct rtllib_device *ieee) cancel_delayed_work_sync(&ieee->softmac_scan_wq); } - up(&ieee->scan_sem); + mutex_unlock(&ieee->scan_mutex); } void rtllib_stop_scan(struct rtllib_device *ieee) @@ -3035,7 +3035,7 @@ void rtllib_softmac_init(struct rtllib_device *ieee) ieee); mutex_init(&ieee->wx_mutex); - sema_init(&ieee->scan_sem, 1); + mutex_init(&ieee->scan_mutex); sema_init(&ieee->ips_sem, 1); spin_lock_init(&ieee->mgmt_tx_lock);