Subject: [PATCH 3/3 net-next] bond: cleanup netpoll code

From: Stephen Hemminger <[email-masked]>
Date: Wed, 24 Jul 2013 11:53:57 -0700

This started out with fixing a sparse warning, then I realized that
the wrapper function bond_netpoll_info could just be removed
by rolling it into the enable code.

Signed-off-by: Stephen Hemminger <[email-masked]>

--- a/drivers/net/bonding/bond_main.c	2013-07-24 08:34:05.229987883 -0700
+++ b/drivers/net/bonding/bond_main.c	2013-07-24 08:34:10.917925434 -0700
@@ -1254,12 +1254,6 @@ static int bond_netpoll_setup(struct net
 	read_unlock(&bond->lock);
 	return err;
 }
-
-static struct netpoll_info *bond_netpoll_info(struct bonding *bond)
-{
-	return bond->dev->npinfo;
-}
-
 #else
 static inline int slave_enable_netpoll(struct slave *slave)
 {
@@ -1804,7 +1798,7 @@ int bond_enslave(struct net_device *bond
 	bond_set_carrier(bond);
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
-	slave_dev->npinfo = bond_netpoll_info(bond);
+	slave_dev->npinfo = bond->dev->npinfo;
 	if (slave_dev->npinfo) {
 		if (slave_enable_netpoll(new_slave)) {
 			read_unlock(&bond->lock);