[PATCH] net: ethernet: micrel: ksz884x: Replace semaphore proc_sem with mutex

Path	csiph.com!aioe.org!news.servidellagleba.it!bofh.it!news.nic.it!robomod
From	Binoy Jayan <binoy.jayan@linaro.org>
Newsgroups	linux.kernel
Subject	[PATCH] net: ethernet: micrel: ksz884x: Replace semaphore proc_sem with mutex
Date	Thu, 08 Jun 2017 12:10:02 +0200
Message-ID	<tQ2y6-2WM-15@gated-at.bofh.it> (permalink)
X-Original-To	Binoy Jayan <binoy.jayan@linaro.org>
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=RAndwr8SYhv72IkMBElVlp9MxDFr1LFKXR6OX049cFg=; b=hNHijOVCo7cRf8s6Y/0FD7/yO6bCHXUqMU90vLxKEBSG02He8isWHfA0fjtHhoFspK oAI38Ri9qJnd9qHiT9SbTUgx6jzT73X1Yenmf4aGHxLZVtEQegZ0bt8KWq0JcmU7zhlW Nq+hDvCsmja21iMSrJhmHaLLioVqtdmeXQ78g=
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=RAndwr8SYhv72IkMBElVlp9MxDFr1LFKXR6OX049cFg=; b=EzwAAZQhfiJHouNaTbIvOLusM1xtlHjmEzywMo7IqgX3CgmJ05IFLqFhMbwZhgJ7ei 48v5qfit3go0ynjLARzRfjt6DoP9UWPdJqO+Hb0BdIalQWfq3mf+UV57yO361USCZmeW zM4rT7zy30jre8COziEpyXuWyWb3Gv+qYmJOHPdUTXYvCy2CI5QFhecNTBJDn/PPyFjT zo+EF6RxmKSmy5ftXgPgSG09TTUyY8Kr1Ls+PM3GoXAGGRNen/e7/srXVtLmxPdqcoq8 lajyVMKe8T8K3M6nmRkrjF3hd3g+/xwdTvOPEx2LXUqi/6UhoMduzjzEWLIG3qnlJfU8 3uMA==
X-Gm-Message-State	AODbwcCcrvxB1HMVWFRbeSi7UWPPZGaS37dqe4hZbpEIsw8RPN9uKsgv LSb0I0kc3+OUCVRz08wtBQ==
X-Received	by 10.84.169.3 with SMTP id g3mr33509393plb.37.1496916241698; Thu, 08 Jun 2017 03:04:01 -0700 (PDT)
X-Mailer	git-send-email 1.9.1
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	63
Organization	linux.* mail to news gateway
X-Original-Cc	linux-kernel@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>, Rajendra <rnayak@codeaurora.org>, Mark Brown <broonie@kernel.org>, "David S. Miller" <davem@davemloft.net>, Jarod Wilson <jarod@redhat.com>, Masahiro Yamada <yamada.masahiro@socionext.com>
X-Original-Date	Thu, 8 Jun 2017 15:33:47 +0530
X-Original-Message-ID	<1496916227-4509-1-git-send-email-binoy.jayan@linaro.org>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1661024

Show key headers only | View raw

The semaphore 'proc_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 <binoy.jayan@linaro.org>
---

This patch is part of a bigger effort to eliminate unwanted
semaphores from the linux kernel.

 drivers/net/ethernet/micrel/ksz884x.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ethernet/micrel/ksz884x.c b/drivers/net/ethernet/micrel/ksz884x.c
index ee1c78a..9664666 100644
--- a/drivers/net/ethernet/micrel/ksz884x.c
+++ b/drivers/net/ethernet/micrel/ksz884x.c
@@ -1456,7 +1456,7 @@ struct dev_info {
  * @adapter:		Adapter device information.
  * @port:		Port information.
  * @monitor_time_info:	Timer to monitor ports.
- * @proc_sem:		Semaphore for proc accessing.
+ * @proc_mutex:		Mutex for proc accessing.
  * @id:			Device ID.
  * @mii_if:		MII interface information.
  * @advertising:	Temporary variable to store advertised settings.
@@ -1470,7 +1470,7 @@ struct dev_priv {
 	struct ksz_port port;
 	struct ksz_timer_info monitor_timer_info;
 
-	struct semaphore proc_sem;
+	struct mutex proc_mutex;
 	int id;
 
 	struct mii_if_info mii_if;
@@ -5842,7 +5842,7 @@ static int netdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 	int result = 0;
 	struct mii_ioctl_data *data = if_mii(ifr);
 
-	if (down_interruptible(&priv->proc_sem))
+	if (mutex_lock_interruptible(&priv->proc_mutex))
 		return -ERESTARTSYS;
 
 	switch (cmd) {
@@ -5876,7 +5876,7 @@ static int netdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 		result = -EOPNOTSUPP;
 	}
 
-	up(&priv->proc_sem);
+	mutex_unlock(&priv->proc_mutex);
 
 	return result;
 }
@@ -6805,7 +6805,7 @@ static int __init netdev_init(struct net_device *dev)
 
 	dev->features |= dev->hw_features;
 
-	sema_init(&priv->proc_sem, 1);
+	mutex_init(&priv->proc_mutex);
 
 	priv->mii_if.phy_id_mask = 0x1;
 	priv->mii_if.reg_num_mask = 0x7;
-- 
Binoy Jayan

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] net: ethernet: micrel: ksz884x: Replace semaphore proc_sem with mutex Binoy Jayan <binoy.jayan@linaro.org> - 2017-06-08 12:10 +0200
  Re: [PATCH] net: ethernet: micrel: ksz884x: Replace semaphore  proc_sem with mutex Arnd Bergmann <arnd@arndb.de> - 2017-06-08 17:00 +0200

csiph-web