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: 103366 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp2359711qgd; Thu, 8 Jun 2017 03:03:57 -0700 (PDT) X-Received: by 10.84.130.98 with SMTP id 89mr20513251plc.222.1496916237633; Thu, 08 Jun 2017 03:03:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496916237; cv=none; d=google.com; s=arc-20160816; b=rBrNoAY5OUXIqZZULTqKUqHlNmcivrosHYJvDOKwSnIiHpF6oSP1AkBhEsZeh1Xf4W 2eC4w/1ANeFqRjbu1bpDAXd49rXTUWvbWzpcRHv4qcBsHgvjcOyg2K1iTPuGiFolqpQQ aO1aXkuKvlnQ1tsZmn8YekLA26Pk4R4bEzm1i2mtCcVrm0INL4fy4IHVfdJgRpJtXUQX d2mEYlhUTRVQ5i4hoafxKYb6xpBfz1PMYOIAdS1ZD6GWlu6XUVZ42xuThWARYuhpuo68 QNhAa10sMqerCmGh1WuH7fYIXeVE8O0I9y+mexms31szyBGI9LKAvNgWgc8p89VVYfqp TFMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=7CRPo2rjc7ojWOpM62GOGQzW/UqkF2uE1GNdK55b38U=; b=oXN/s5z1DuGu70MKqzJoQZiA7TBTagOyoObo8hcQvOhwLAZOrMOhcOHkREeOT0Znt4 VRdw1yUX2BbLzY46xPsN1G8qsOBxrI//MLE7yBaWYX26tfu+RqPVH7c48vYzCO+qKCnz ZWJ4c1fZHJVS5kUxd3/CK/xBBYyshX+snMe6wqabnh1WsF5X0vQY6kpJZNJ/Mo0BFD/D /iEthrCtJ8zaEqPCB1ycOqTFAwh7ipi+zJKgE2bNVkg3NcaoagqrSXAZ6Qtib1oNbJZ9 KxKzKLo+v6dGNamIKSaCSu2t2JD4wOjvv2Smk1ALzC867Y6l6FwIQyMWXbhwgn4/uvAI W+2g== ARC-Authentication-Results: i=1; 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 sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f2si3056110pfd.406.2017.06.08.03.03.57; Thu, 08 Jun 2017 03:03:57 -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 sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751673AbdFHKD3 (ORCPT + 25 others); Thu, 8 Jun 2017 06:03:29 -0400 Received: from mail-pg0-f54.google.com ([74.125.83.54]:36389 "EHLO mail-pg0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751535AbdFHKD0 (ORCPT ); Thu, 8 Jun 2017 06:03:26 -0400 Received: by mail-pg0-f54.google.com with SMTP id a70so14544157pge.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=b44B3NlfIq7DSUg6za8q61n0Wn2IFnCAUX3daGleVYU0aMJAdcPkuV8Eg0jn+tz2jA t47iMYFCNuPZQQx2x4m2uw/3+4i0N4lIJ4NMLnc/U6OyPEAmu9ACuIlYUMV/b3pROc5S GMJCL3KIYvHXidvDuS2UZk8awrtM+5024s7Y2XX72pOikEEFtOVddE3fV67sjhXHSY+K DG0Gdb7+UNqPO0tXqgyZxswGMQdS+27qGZNy4CYxlV/4yfkTgSZ9EzV47n21x6u9ZxRC Eu15wcShAq+TnSyc2vivzK8aWcuN/UWwbgXQH6DGVSVbLxfJXbi7oiNXwigH1Fiyj1ii yfUg== X-Gm-Message-State: AODbwcAj36HwjyQ4qb0Ij00GzxX1eN0A8KygHrYN16k1wfYGcf1CKDGa /b5Ki8pWB313+0lz 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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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(-) -- Binoy Jayan Reviewed-by: Arnd Bergmann 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; }