From patchwork Thu Jun 8 10:03:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Binoy Jayan X-Patchwork-Id: 9774361 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0AE2160393 for ; Thu, 8 Jun 2017 10:03:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EC55A284A4 for ; Thu, 8 Jun 2017 10:03:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DF7CE284D5; Thu, 8 Jun 2017 10:03:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B6BE0284A4 for ; Thu, 8 Jun 2017 10:03:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751662AbdFHKD2 (ORCPT ); Thu, 8 Jun 2017 06:03:28 -0400 Received: from mail-pg0-f52.google.com ([74.125.83.52]:36389 "EHLO mail-pg0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751533AbdFHKD0 (ORCPT ); Thu, 8 Jun 2017 06:03:26 -0400 Received: by mail-pg0-f52.google.com with SMTP id a70so14544155pge.3 for ; Thu, 08 Jun 2017 03:03:26 -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; bh=7CRPo2rjc7ojWOpM62GOGQzW/UqkF2uE1GNdK55b38U=; b=LqVDq0+u7Jo3za5X5Ht7qdJLfe+UGlaA92cPugGuVd4s4VI6MBqRfxeOWm+J9w4eJv uMiRB//TQcfqci/sHb70QaSN83VuxLbh+TILJtinzTJldd2JFZ2hN/2nuSe/LCBcwkIH zO2hFP+mPFVwVUTC4qGdaFq3CcKjTHewn9wzs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=7CRPo2rjc7ojWOpM62GOGQzW/UqkF2uE1GNdK55b38U=; b=lbU2LW/FqbUSgtbDkMEagOG7ayePS/EXKBjqfEUImldZ/g4fu30Jh5Smge9mwGxPAb 75baieGzD9a/3CvkqA3sYu119OTrOWM5DU5zK/4WlItQiYIgz0SG8RiLsAnAdLF9qxd5 7X2xORkRKVDtJEI3MBVZTBDt4H6dpB8578quq4gQQH9YdMW8zBOq40S990nAJ7qXSJSm 2HK7xktfluCYT+MUpZWa/pAvQCHgIh0XUh68iLaP9Wp1qd1obn/jfiIuq3lgSXYOx8+w alaGVJiEs/TzIZLA0EOOj4TARslWVQRAsBD5x9O47lIal7kB8wK8rhncP1AWfKH/Bjoi WlBQ== X-Gm-Message-State: AODbwcAOXzwxKF7bpfUiWQReTZfQMEoi/gnWVnphAGD9ReXFfcmYYxlv 1nzsrZnLeJdNuTaI X-Received: by 10.98.85.130 with SMTP id j124mr30938290pfb.196.1496916206040; Thu, 08 Jun 2017 03:03:26 -0700 (PDT) Received: from blr-ubuntu-59.ap.qualcomm.com (blr-bdr-fw-01_globalnat_allzones-outside.qualcomm.com. [103.229.18.19]) by smtp.gmail.com with ESMTPSA id 192sm8621583pfb.10.2017.06.08.03.03.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 08 Jun 2017 03:03:25 -0700 (PDT) From: Binoy Jayan To: Binoy Jayan Cc: linux-kernel@vger.kernel.org, Arnd Bergmann , Rajendra , Mark Brown , Amitkumar Karwar , Nishant Sarmukadam , Ganapathi Bhat , Xinming Hu , Kalle Valo , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH] mwifiex: Replace semaphore async_sem with mutex Date: Thu, 8 Jun 2017 15:33:03 +0530 Message-Id: <1496916183-4097-1-git-send-email-binoy.jayan@linaro.org> X-Mailer: git-send-email 1.9.1 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The semaphore 'async_sem' is used as a simple mutex, so it should be written as one. Semaphores are going away in the future. Signed-off-by: Binoy Jayan Reviewed-by: Arnd Bergmann --- This patch is part of a bigger effort to eliminate unwanted semaphores from the linux kernel. drivers/net/wireless/marvell/mwifiex/cfg80211.c | 2 +- drivers/net/wireless/marvell/mwifiex/main.h | 2 +- drivers/net/wireless/marvell/mwifiex/scan.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c index 7ec06bf..9e0d638 100644 --- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c +++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c @@ -3059,7 +3059,7 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy, INIT_DELAYED_WORK(&priv->dfs_chan_sw_work, mwifiex_dfs_chan_sw_work_queue); - sema_init(&priv->async_sem, 1); + mutex_init(&priv->async_mutex); mwifiex_dbg(adapter, INFO, "info: %s: Marvell 802.11 Adapter\n", dev->name); diff --git a/drivers/net/wireless/marvell/mwifiex/main.h b/drivers/net/wireless/marvell/mwifiex/main.h index bb2a467..9c2cb33 100644 --- a/drivers/net/wireless/marvell/mwifiex/main.h +++ b/drivers/net/wireless/marvell/mwifiex/main.h @@ -628,7 +628,7 @@ struct mwifiex_private { struct dentry *dfs_dev_dir; #endif u16 current_key_index; - struct semaphore async_sem; + struct mutex async_mutex; struct cfg80211_scan_request *scan_request; u8 cfg_bssid[6]; struct wps wps; diff --git a/drivers/net/wireless/marvell/mwifiex/scan.c b/drivers/net/wireless/marvell/mwifiex/scan.c index ce6936d..ae9630b 100644 --- a/drivers/net/wireless/marvell/mwifiex/scan.c +++ b/drivers/net/wireless/marvell/mwifiex/scan.c @@ -2809,7 +2809,7 @@ int mwifiex_request_scan(struct mwifiex_private *priv, { int ret; - if (down_interruptible(&priv->async_sem)) { + if (mutex_lock_interruptible(&priv->async_mutex)) { mwifiex_dbg(priv->adapter, ERROR, "%s: acquire semaphore fail\n", __func__); @@ -2825,7 +2825,7 @@ int mwifiex_request_scan(struct mwifiex_private *priv, /* Normal scan */ ret = mwifiex_scan_networks(priv, NULL); - up(&priv->async_sem); + mutex_unlock(&priv->async_mutex); return ret; }