From: Rupert Muchembled <rupert@rmuch.net>
Date: Fri, 8 Nov 2013 06:01:49 +0000 (+0000)
Subject: Staging: silicom: Remove unnecessary variable from get_bypass_info()
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=473b1716256d2b01bfd105e6af96ccc34b951fe3;p=openwrt%2Fstaging%2Fblogic.git

Staging: silicom: Remove unnecessary variable from get_bypass_info()

Remove unnecessary variable ioctl from get_bypass_info().

As a consequence, this patch removes an assignment to ioctl in an if condition,
reported by checkpatch.pl.

Signed-off-by: Rupert Muchembled <rupert@rmuch.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/silicom/bypasslib/bypass.c b/drivers/staging/silicom/bypasslib/bypass.c
index 7d2cb54ad6c0..dda1b2a6b84b 100644
--- a/drivers/staging/silicom/bypasslib/bypass.c
+++ b/drivers/staging/silicom/bypasslib/bypass.c
@@ -480,7 +480,6 @@ static int get_bypass_info(int if_index, struct bp_info *bp_info)
 		SET_BPLIB_INT_FN2(get_bypass_info, int, if_index,
 				  struct bp_info *, bp_info, ret);
 	} else {
-		static int (*ioctl) (struct net_device *, struct ifreq *, int);
 		struct net_device *dev;
 
 		struct net_device *n;
@@ -493,9 +492,10 @@ static int get_bypass_info(int if_index, struct bp_info *bp_info)
 				bypass_cb = (struct if_bypass_info *)&ifr;
 				bypass_cb->cmd = GET_BYPASS_INFO;
 
-				if ((dev->netdev_ops) &&
-				    (ioctl = dev->netdev_ops->ndo_do_ioctl)) {
-					ret = ioctl(dev, &ifr, SIOCGIFBYPASS);
+				if (dev->netdev_ops &&
+					dev->netdev_ops->ndo_do_ioctl) {
+					ret = dev->netdev_ops->ndo_do_ioctl(dev,
+						&ifr, SIOCGIFBYPASS);
 				}
 
 				else