netpoll: remove ndo_netpoll_setup() second argument

edumazet · Paolo Abeni · commit e44ef3f66c54 · 2024-10-23T13:31:32.000+02:00
npinfo is not used in any of the ndo_netpoll_setup() methods. Signed-off-by: Eric Dumazet <edumazet@google.com> Reviewed-by: Simon Horman <horms@kernel.org> Link: https://patch.msgid.link/20241018052108.2610827-1-edumazet@google.com Signed-off-by: Paolo Abeni <pabeni@redhat.com>
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
@@ -1476,7 +1476,7 @@ static void bond_netpoll_cleanup(struct net_device *bond_dev)
 			slave_disable_netpoll(slave);
 }
 
-static int bond_netpoll_setup(struct net_device *dev, struct netpoll_info *ni)
+static int bond_netpoll_setup(struct net_device *dev)
 {
 	struct bonding *bond = netdev_priv(dev);
 	struct list_head *iter;
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
@@ -1117,7 +1117,7 @@ static void macvlan_dev_poll_controller(struct net_device *dev)
 	return;
 }
 
-static int macvlan_dev_netpoll_setup(struct net_device *dev, struct netpoll_info *npinfo)
+static int macvlan_dev_netpoll_setup(struct net_device *dev)
 {
 	struct macvlan_dev *vlan = netdev_priv(dev);
 	struct net_device *real_dev = vlan->lowerdev;
diff --git a/drivers/net/team/team_core.c b/drivers/net/team/team_core.c
@@ -1946,8 +1946,7 @@ static void team_netpoll_cleanup(struct net_device *dev)
 	mutex_unlock(&team->lock);
 }
 
-static int team_netpoll_setup(struct net_device *dev,
-			      struct netpoll_info *npifo)
+static int team_netpoll_setup(struct net_device *dev)
 {
 	struct team *team = netdev_priv(dev);
 	struct team_port *port;
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
@@ -1425,8 +1425,7 @@ struct net_device_ops {
 						        __be16 proto, u16 vid);
 #ifdef CONFIG_NET_POLL_CONTROLLER
 	void                    (*ndo_poll_controller)(struct net_device *dev);
-	int			(*ndo_netpoll_setup)(struct net_device *dev,
-						     struct netpoll_info *info);
+	int			(*ndo_netpoll_setup)(struct net_device *dev);
 	void			(*ndo_netpoll_cleanup)(struct net_device *dev);
 #endif
 	int			(*ndo_set_vf_mac)(struct net_device *dev,
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
@@ -725,7 +725,7 @@ static void vlan_dev_poll_controller(struct net_device *dev)
 	return;
 }
 
-static int vlan_dev_netpoll_setup(struct net_device *dev, struct netpoll_info *npinfo)
+static int vlan_dev_netpoll_setup(struct net_device *dev)
 {
 	struct vlan_dev_priv *vlan = vlan_dev_priv(dev);
 	struct net_device *real_dev = vlan->real_dev;
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
@@ -328,7 +328,7 @@ int br_netpoll_enable(struct net_bridge_port *p)
 	return __br_netpoll_enable(p);
 }
 
-static int br_netpoll_setup(struct net_device *dev, struct netpoll_info *ni)
+static int br_netpoll_setup(struct net_device *dev)
 {
 	struct net_bridge *br = netdev_priv(dev);
 	struct net_bridge_port *p;
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
@@ -641,7 +641,7 @@ int __netpoll_setup(struct netpoll *np, struct net_device *ndev)
 
 		ops = ndev->netdev_ops;
 		if (ops->ndo_netpoll_setup) {
-			err = ops->ndo_netpoll_setup(ndev, npinfo);
+			err = ops->ndo_netpoll_setup(ndev);
 			if (err)
 				goto free_npinfo;
 		}
diff --git a/net/dsa/user.c b/net/dsa/user.c
@@ -1308,8 +1308,7 @@ static int dsa_user_set_pauseparam(struct net_device *dev,
 }
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
-static int dsa_user_netpoll_setup(struct net_device *dev,
-				  struct netpoll_info *ni)
+static int dsa_user_netpoll_setup(struct net_device *dev)
 {
 	struct net_device *conduit = dsa_user_to_conduit(dev);
 	struct dsa_user_priv *p = netdev_priv(dev);

Original file line number	Diff line number	Diff line change
`@@ -1476,7 +1476,7 @@ static void bond_netpoll_cleanup(struct net_device *bond_dev)`
`1476`	`1476`	`slave_disable_netpoll(slave);`
`1477`	`1477`	`}`
`1478`	`1478`
`1479`		`-static int bond_netpoll_setup(struct net_device dev, struct netpoll_info ni)`
	`1479`	`+static int bond_netpoll_setup(struct net_device *dev)`
`1480`	`1480`	`{`
`1481`	`1481`	`struct bonding *bond = netdev_priv(dev);`
`1482`	`1482`	`struct list_head *iter;`
Original file line number	Diff line number	Diff line change
`@@ -1117,7 +1117,7 @@ static void macvlan_dev_poll_controller(struct net_device *dev)`
`1117`	`1117`	`return;`
`1118`	`1118`	`}`
`1119`	`1119`
`1120`		`-static int macvlan_dev_netpoll_setup(struct net_device dev, struct netpoll_info npinfo)`
	`1120`	`+static int macvlan_dev_netpoll_setup(struct net_device *dev)`
`1121`	`1121`	`{`
`1122`	`1122`	`struct macvlan_dev *vlan = netdev_priv(dev);`
`1123`	`1123`	`struct net_device *real_dev = vlan->lowerdev;`
Original file line number	Diff line number	Diff line change
`@@ -1946,8 +1946,7 @@ static void team_netpoll_cleanup(struct net_device *dev)`
`1946`	`1946`	`mutex_unlock(&team->lock);`
`1947`	`1947`	`}`
`1948`	`1948`
`1949`		`-static int team_netpoll_setup(struct net_device *dev,`
`1950`		`- struct netpoll_info *npifo)`
	`1949`	`+static int team_netpoll_setup(struct net_device *dev)`
`1951`	`1950`	`{`
`1952`	`1951`	`struct team *team = netdev_priv(dev);`
`1953`	`1952`	`struct team_port *port;`
Original file line number	Diff line number	Diff line change
`@@ -725,7 +725,7 @@ static void vlan_dev_poll_controller(struct net_device *dev)`
`725`	`725`	`return;`
`726`	`726`	`}`
`727`	`727`
`728`		`-static int vlan_dev_netpoll_setup(struct net_device dev, struct netpoll_info npinfo)`
	`728`	`+static int vlan_dev_netpoll_setup(struct net_device *dev)`
`729`	`729`	`{`
`730`	`730`	`struct vlan_dev_priv *vlan = vlan_dev_priv(dev);`
`731`	`731`	`struct net_device *real_dev = vlan->real_dev;`
Original file line number	Diff line number	Diff line change
`@@ -328,7 +328,7 @@ int br_netpoll_enable(struct net_bridge_port *p)`
`328`	`328`	`return __br_netpoll_enable(p);`
`329`	`329`	`}`
`330`	`330`
`331`		`-static int br_netpoll_setup(struct net_device dev, struct netpoll_info ni)`
	`331`	`+static int br_netpoll_setup(struct net_device *dev)`
`332`	`332`	`{`
`333`	`333`	`struct net_bridge *br = netdev_priv(dev);`
`334`	`334`	`struct net_bridge_port *p;`
Original file line number	Diff line number	Diff line change
`@@ -641,7 +641,7 @@ int __netpoll_setup(struct netpoll np, struct net_device ndev)`
`641`	`641`
`642`	`642`	`ops = ndev->netdev_ops;`
`643`	`643`	`if (ops->ndo_netpoll_setup) {`
`644`		`- err = ops->ndo_netpoll_setup(ndev, npinfo);`
	`644`	`+ err = ops->ndo_netpoll_setup(ndev);`
`645`	`645`	`if (err)`
`646`	`646`	`goto free_npinfo;`
`647`	`647`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1308,8 +1308,7 @@ static int dsa_user_set_pauseparam(struct net_device *dev,`
`1308`	`1308`	`}`
`1309`	`1309`
`1310`	`1310`	`#ifdef CONFIG_NET_POLL_CONTROLLER`
`1311`		`-static int dsa_user_netpoll_setup(struct net_device *dev,`
`1312`		`- struct netpoll_info *ni)`
	`1311`	`+static int dsa_user_netpoll_setup(struct net_device *dev)`
`1313`	`1312`	`{`
`1314`	`1313`	`struct net_device *conduit = dsa_user_to_conduit(dev);`
`1315`	`1314`	`struct dsa_user_priv *p = netdev_priv(dev);`