Commit e44ef3f6 authored by Eric Dumazet's avatar Eric Dumazet Committed by Paolo Abeni
Browse files

netpoll: remove ndo_netpoll_setup() second argument 



npinfo is not used in any of the ndo_netpoll_setup() methods.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20241018052108.2610827-1-edumazet@google.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent c972c1c4

drivers/net/bonding/bond_main.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/net/macvlan.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/net/team/team_core.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

include/linux/netdevice.h

+1 −2
Original line number Diff line number Diff line
@@ -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,

net/8021q/vlan_dev.c

+1 −1
Original line number Diff line number Diff line
@@ -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;