Commit bd323fab authored by Ethan Nelson-Moore's avatar Ethan Nelson-Moore Committed by Jakub Kicinski
Browse files

net: usb: replace unnecessary get_link functions with usbnet_get_link 



usbnet_get_link calls mii_link_ok if the device has a MII defined in
its usbnet struct and no check_connect function defined there. This is
true of these drivers, so their custom get_link functions which call
mii_link_ok are useless. Remove them in favor of usbnet_get_link.

Signed-off-by: default avatarEthan Nelson-Moore <enelsonmoore@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Reviewed-by: default avatarPeter Korsgaard <peter@korsgaard.com>
Link: https://patch.msgid.link/20260124082217.82351-1-enelsonmoore@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 2dd698f6

drivers/net/usb/asix_devices.c

+2 −9
Original line number Diff line number Diff line
@@ -97,13 +97,6 @@ static u32 asix_get_phyid(struct usbnet *dev) 
	return phy_id;

}



static u32 asix_get_link(struct net_device *net)

{

	struct usbnet *dev = netdev_priv(net);



	return mii_link_ok(&dev->mii);

}



static int asix_ioctl (struct net_device *net, struct ifreq *rq, int cmd)

{

	struct usbnet *dev = netdev_priv(net);
@@ -116,7 +109,7 @@ static int asix_ioctl (struct net_device *net, struct ifreq *rq, int cmd) 
   devices that may be connected at the same time. */

static const struct ethtool_ops ax88172_ethtool_ops = {

	.get_drvinfo		= asix_get_drvinfo,

	.get_link		= asix_get_link,

	.get_link		= usbnet_get_link,

	.get_msglevel		= usbnet_get_msglevel,

	.set_msglevel		= usbnet_set_msglevel,

	.get_wol		= asix_get_wol,
@@ -986,7 +979,7 @@ static void ax88178_unbind(struct usbnet *dev, struct usb_interface *intf) 


static const struct ethtool_ops ax88178_ethtool_ops = {

	.get_drvinfo		= asix_get_drvinfo,

	.get_link		= asix_get_link,

	.get_link		= usbnet_get_link,

	.get_msglevel		= usbnet_get_msglevel,

	.set_msglevel		= usbnet_set_msglevel,

	.get_wol		= asix_get_wol,

drivers/net/usb/dm9601.c

+1 −8
Original line number Diff line number Diff line
@@ -266,13 +266,6 @@ static void dm9601_get_drvinfo(struct net_device *net, 
	usbnet_get_drvinfo(net, info);

}



static u32 dm9601_get_link(struct net_device *net)

{

	struct usbnet *dev = netdev_priv(net);



	return mii_link_ok(&dev->mii);

}



static int dm9601_ioctl(struct net_device *net, struct ifreq *rq, int cmd)

{

	struct usbnet *dev = netdev_priv(net);
@@ -282,7 +275,7 @@ static int dm9601_ioctl(struct net_device *net, struct ifreq *rq, int cmd) 


static const struct ethtool_ops dm9601_ethtool_ops = {

	.get_drvinfo	= dm9601_get_drvinfo,

	.get_link	= dm9601_get_link,

	.get_link	= usbnet_get_link,

	.get_msglevel	= usbnet_get_msglevel,

	.set_msglevel	= usbnet_set_msglevel,

	.get_eeprom_len	= dm9601_get_eeprom_len,

drivers/net/usb/sr9800.c

+1 −8
Original line number Diff line number Diff line
@@ -478,13 +478,6 @@ static void sr_get_drvinfo(struct net_device *net, 
	strscpy(info->version, DRIVER_VERSION, sizeof(info->version));

}



static u32 sr_get_link(struct net_device *net)

{

	struct usbnet *dev = netdev_priv(net);



	return mii_link_ok(&dev->mii);

}



static int sr_ioctl(struct net_device *net, struct ifreq *rq, int cmd)

{

	struct usbnet *dev = netdev_priv(net);
@@ -519,7 +512,7 @@ static int sr_set_mac_address(struct net_device *net, void *p) 


static const struct ethtool_ops sr9800_ethtool_ops = {

	.get_drvinfo	= sr_get_drvinfo,

	.get_link	= sr_get_link,

	.get_link	= usbnet_get_link,

	.get_msglevel	= usbnet_get_msglevel,

	.set_msglevel	= usbnet_set_msglevel,

	.get_wol	= sr_get_wol,