Merge branch 'dev_close-void'

davem330 · davem330 · commit 9492f4269e6b · 2017-07-19T16:45:16.000-07:00
Stephen Hemminger says:

====================
net: make dev_close void

Noticed while working on other changes. Why is dev_close()
returning int, it should be void.  Should also change
ndo_close to be void, but that requires more work and someone
with more coccinelle foo (smpl) than me.
====================

Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
@@ -595,7 +595,7 @@ static void hns_nic_self_test(struct net_device *ndev,
 		set_bit(NIC_STATE_TESTING, &priv->state);
 
 		if (if_running)
-			(void)dev_close(ndev);
+			dev_close(ndev);
 
 		for (i = 0; i < SELF_TEST_TPYE_NUM; i++) {
 			if (!st_param[i][1])
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
@@ -2432,8 +2432,8 @@ struct net_device *dev_get_by_name_rcu(struct net *net, const char *name);
 struct net_device *__dev_get_by_name(struct net *net, const char *name);
 int dev_alloc_name(struct net_device *dev, const char *name);
 int dev_open(struct net_device *dev);
-int dev_close(struct net_device *dev);
-int dev_close_many(struct list_head *head, bool unlink);
+void dev_close(struct net_device *dev);
+void dev_close_many(struct list_head *head, bool unlink);
 void dev_disable_lro(struct net_device *dev);
 int dev_loopback_xmit(struct net *net, struct sock *sk, struct sk_buff *newskb);
 int dev_queue_xmit(struct sk_buff *skb);
diff --git a/net/bluetooth/6lowpan.c b/net/bluetooth/6lowpan.c
@@ -618,12 +618,8 @@ static void ifup(struct net_device *netdev)
 
 static void ifdown(struct net_device *netdev)
 {
-	int err;
-
 	rtnl_lock();
-	err = dev_close(netdev);
-	if (err < 0)
-		BT_INFO("iface %s cannot be closed (%d)", netdev->name, err);
+	dev_close(netdev);
 	rtnl_unlock();
 }
 
diff --git a/net/core/dev.c b/net/core/dev.c
@@ -1413,7 +1413,7 @@ int dev_open(struct net_device *dev)
 }
 EXPORT_SYMBOL(dev_open);
 
-static int __dev_close_many(struct list_head *head)
+static void __dev_close_many(struct list_head *head)
 {
 	struct net_device *dev;
 
@@ -1455,23 +1455,18 @@ static int __dev_close_many(struct list_head *head)
 		dev->flags &= ~IFF_UP;
 		netpoll_poll_enable(dev);
 	}
-
-	return 0;
 }
 
-static int __dev_close(struct net_device *dev)
+static void __dev_close(struct net_device *dev)
 {
-	int retval;
 	LIST_HEAD(single);
 
 	list_add(&dev->close_list, &single);
-	retval = __dev_close_many(&single);
+	__dev_close_many(&single);
 	list_del(&single);
-
-	return retval;
 }
 
-int dev_close_many(struct list_head *head, bool unlink)
+void dev_close_many(struct list_head *head, bool unlink)
 {
 	struct net_device *dev, *tmp;
 
@@ -1488,8 +1483,6 @@ int dev_close_many(struct list_head *head, bool unlink)
 		if (unlink)
 			list_del_init(&dev->close_list);
 	}
-
-	return 0;
 }
 EXPORT_SYMBOL(dev_close_many);
 
@@ -1502,7 +1495,7 @@ EXPORT_SYMBOL(dev_close_many);
  *	is then deactivated and finally a %NETDEV_DOWN is sent to the notifier
  *	chain.
  */
-int dev_close(struct net_device *dev)
+void dev_close(struct net_device *dev)
 {
 	if (dev->flags & IFF_UP) {
 		LIST_HEAD(single);
@@ -1511,7 +1504,6 @@ int dev_close(struct net_device *dev)
 		dev_close_many(&single, true);
 		list_del(&single);
 	}
-	return 0;
 }
 EXPORT_SYMBOL(dev_close);
 
@@ -6725,8 +6717,12 @@ int __dev_change_flags(struct net_device *dev, unsigned int flags)
 	 */
 
 	ret = 0;
-	if ((old_flags ^ flags) & IFF_UP)
-		ret = ((old_flags & IFF_UP) ? __dev_close : __dev_open)(dev);
+	if ((old_flags ^ flags) & IFF_UP) {
+		if (old_flags & IFF_UP)
+			__dev_close(dev);
+		else
+			ret = __dev_open(dev);
+	}
 
 	if ((flags ^ dev->gflags) & IFF_PROMISC) {
 		int inc = (flags & IFF_PROMISC) ? 1 : -1;

Original file line number	Diff line number	Diff line change
`@@ -618,12 +618,8 @@ static void ifup(struct net_device *netdev)`
`618`	`618`
`619`	`619`	`static void ifdown(struct net_device *netdev)`
`620`	`620`	`{`
`621`		`- int err;`
`622`		`-`
`623`	`621`	`rtnl_lock();`
`624`		`- err = dev_close(netdev);`
`625`		`- if (err < 0)`
`626`		`- BT_INFO("iface %s cannot be closed (%d)", netdev->name, err);`
	`622`	`+ dev_close(netdev);`
`627`	`623`	`rtnl_unlock();`
`628`	`624`	`}`
`629`	`625`
Original file line number	Diff line number	Diff line change
`@@ -1413,7 +1413,7 @@ int dev_open(struct net_device *dev)`
`1413`	`1413`	`}`
`1414`	`1414`	`EXPORT_SYMBOL(dev_open);`
`1415`	`1415`
`1416`		`-static int __dev_close_many(struct list_head *head)`
	`1416`	`+static void __dev_close_many(struct list_head *head)`
`1417`	`1417`	`{`
`1418`	`1418`	`struct net_device *dev;`
`1419`	`1419`
`@@ -1455,23 +1455,18 @@ static int __dev_close_many(struct list_head *head)`
`1455`	`1455`	`dev->flags &= ~IFF_UP;`
`1456`	`1456`	`netpoll_poll_enable(dev);`
`1457`	`1457`	`}`
`1458`		`-`
`1459`		`- return 0;`
`1460`	`1458`	`}`
`1461`	`1459`
`1462`		`-static int __dev_close(struct net_device *dev)`
	`1460`	`+static void __dev_close(struct net_device *dev)`
`1463`	`1461`	`{`
`1464`		`- int retval;`
`1465`	`1462`	`LIST_HEAD(single);`
`1466`	`1463`
`1467`	`1464`	`list_add(&dev->close_list, &single);`
`1468`		`- retval = __dev_close_many(&single);`
	`1465`	`+ __dev_close_many(&single);`
`1469`	`1466`	`list_del(&single);`
`1470`		`-`
`1471`		`- return retval;`
`1472`	`1467`	`}`
`1473`	`1468`
`1474`		`-int dev_close_many(struct list_head *head, bool unlink)`
	`1469`	`+void dev_close_many(struct list_head *head, bool unlink)`
`1475`	`1470`	`{`
`1476`	`1471`	`struct net_device dev, tmp;`
`1477`	`1472`
`@@ -1488,8 +1483,6 @@ int dev_close_many(struct list_head *head, bool unlink)`
`1488`	`1483`	`if (unlink)`
`1489`	`1484`	`list_del_init(&dev->close_list);`
`1490`	`1485`	`}`
`1491`		`-`
`1492`		`- return 0;`
`1493`	`1486`	`}`
`1494`	`1487`	`EXPORT_SYMBOL(dev_close_many);`
`1495`	`1488`
`@@ -1502,7 +1495,7 @@ EXPORT_SYMBOL(dev_close_many);`
`1502`	`1495`	`* is then deactivated and finally a %NETDEV_DOWN is sent to the notifier`
`1503`	`1496`	`* chain.`
`1504`	`1497`	`*/`
`1505`		`-int dev_close(struct net_device *dev)`
	`1498`	`+void dev_close(struct net_device *dev)`
`1506`	`1499`	`{`
`1507`	`1500`	`if (dev->flags & IFF_UP) {`
`1508`	`1501`	`LIST_HEAD(single);`
`@@ -1511,7 +1504,6 @@ int dev_close(struct net_device *dev)`
`1511`	`1504`	`dev_close_many(&single, true);`
`1512`	`1505`	`list_del(&single);`
`1513`	`1506`	`}`
`1514`		`- return 0;`
`1515`	`1507`	`}`
`1516`	`1508`	`EXPORT_SYMBOL(dev_close);`
`1517`	`1509`
`@@ -6725,8 +6717,12 @@ int __dev_change_flags(struct net_device *dev, unsigned int flags)`
`6725`	`6717`	`*/`
`6726`	`6718`
`6727`	`6719`	`ret = 0;`
`6728`		`- if ((old_flags ^ flags) & IFF_UP)`
`6729`		`- ret = ((old_flags & IFF_UP) ? __dev_close : __dev_open)(dev);`
	`6720`	`+ if ((old_flags ^ flags) & IFF_UP) {`
	`6721`	`+ if (old_flags & IFF_UP)`
	`6722`	`+ __dev_close(dev);`
	`6723`	`+ else`
	`6724`	`+ ret = __dev_open(dev);`
	`6725`	`+ }`
`6730`	`6726`
`6731`	`6727`	`if ((flags ^ dev->gflags) & IFF_PROMISC) {`
`6732`	`6728`	`int inc = (flags & IFF_PROMISC) ? 1 : -1;`