Many USB network drivers define get_drvinfo functions which add no value over usbnet_get_drvinfo, only setting the driver name and version. usbnet_get_drvinfo automatically sets the driver name, and separate driver versions are now frowned upon in the kernel. Remove all driver versions and replace these get_drvinfo functions with references to usbnet_get_drvinfo where possible. Where that is not possible, remove unnecessary code to set the driver name. Also remove two unnecessary initializations from aqc111_get_drvinfo, an inaccurate comment in pegasus.c, and an unused macro in catc.c. Reviewed-by: Andy Shevchenko Signed-off-by: Ethan Nelson-Moore --- Changes in v3: Add changelog Add received Reviewed-by tag Changes in v2: Also remove driver versions from smsc[79]5xx (missed in the original patch because they had a version definition but didn't use it in get_drvinfo) drivers/net/usb/aqc111.c | 5 ----- drivers/net/usb/asix.h | 3 --- drivers/net/usb/asix_common.c | 8 -------- drivers/net/usb/asix_devices.c | 8 +++----- drivers/net/usb/ax88172a.c | 2 +- drivers/net/usb/catc.c | 7 ------- drivers/net/usb/dm9601.c | 9 +-------- drivers/net/usb/mcs7830.c | 7 +------ drivers/net/usb/pegasus.c | 3 --- drivers/net/usb/r8152.c | 10 ---------- drivers/net/usb/rtl8150.c | 3 --- drivers/net/usb/sierra_net.c | 14 +------------- drivers/net/usb/smsc75xx.c | 3 --- drivers/net/usb/smsc95xx.c | 3 --- drivers/net/usb/sr9800.c | 12 +----------- drivers/net/usb/sr9800.h | 3 +-- 16 files changed, 9 insertions(+), 91 deletions(-) diff --git a/drivers/net/usb/aqc111.c b/drivers/net/usb/aqc111.c index 9201ee10a13f..0722050dbe32 100644 --- a/drivers/net/usb/aqc111.c +++ b/drivers/net/usb/aqc111.c @@ -20,8 +20,6 @@ #include "aqc111.h" -#define DRIVER_NAME "aqc111" - static int aqc111_read_cmd_nopm(struct usbnet *dev, u8 cmd, u16 value, u16 index, u16 size, void *data) { @@ -207,13 +205,10 @@ static void aqc111_get_drvinfo(struct net_device *net, /* Inherit standard device info */ usbnet_get_drvinfo(net, info); - strscpy(info->driver, DRIVER_NAME, sizeof(info->driver)); snprintf(info->fw_version, sizeof(info->fw_version), "%u.%u.%u", aqc111_data->fw_ver.major, aqc111_data->fw_ver.minor, aqc111_data->fw_ver.rev); - info->eedump_len = 0x00; - info->regdump_len = 0x00; } static void aqc111_get_wol(struct net_device *net, diff --git a/drivers/net/usb/asix.h b/drivers/net/usb/asix.h index 8531b804021a..cf97bc3d388b 100644 --- a/drivers/net/usb/asix.h +++ b/drivers/net/usb/asix.h @@ -29,7 +29,6 @@ #include #include -#define DRIVER_VERSION "22-Dec-2011" #define DRIVER_NAME "asix" /* ASIX AX8817X based USB 2.0 Ethernet Devices */ @@ -248,8 +247,6 @@ int asix_get_eeprom(struct net_device *net, struct ethtool_eeprom *eeprom, int asix_set_eeprom(struct net_device *net, struct ethtool_eeprom *eeprom, u8 *data); -void asix_get_drvinfo(struct net_device *net, struct ethtool_drvinfo *info); - int asix_set_mac_address(struct net_device *net, void *p); #endif /* _ASIX_H */ diff --git a/drivers/net/usb/asix_common.c b/drivers/net/usb/asix_common.c index 6ab3486072cb..4f03f4e57655 100644 --- a/drivers/net/usb/asix_common.c +++ b/drivers/net/usb/asix_common.c @@ -731,14 +731,6 @@ int asix_set_eeprom(struct net_device *net, struct ethtool_eeprom *eeprom, return ret; } -void asix_get_drvinfo(struct net_device *net, struct ethtool_drvinfo *info) -{ - /* Inherit standard device info */ - usbnet_get_drvinfo(net, info); - strscpy(info->driver, DRIVER_NAME, sizeof(info->driver)); - strscpy(info->version, DRIVER_VERSION, sizeof(info->version)); -} - int asix_set_mac_address(struct net_device *net, void *p) { struct usbnet *dev = netdev_priv(net); diff --git a/drivers/net/usb/asix_devices.c b/drivers/net/usb/asix_devices.c index 232bbd79a4de..96fa5dc2b469 100644 --- a/drivers/net/usb/asix_devices.c +++ b/drivers/net/usb/asix_devices.c @@ -115,7 +115,7 @@ static int asix_ioctl (struct net_device *net, struct ifreq *rq, int cmd) own structure so we don't interfere with other usbnet devices that may be connected at the same time. */ static const struct ethtool_ops ax88172_ethtool_ops = { - .get_drvinfo = asix_get_drvinfo, + .get_drvinfo = usbnet_get_drvinfo, .get_link = asix_get_link, .get_msglevel = usbnet_get_msglevel, .set_msglevel = usbnet_set_msglevel, @@ -324,7 +324,7 @@ static int ax88772_ethtool_set_pauseparam(struct net_device *ndev, } static const struct ethtool_ops ax88772_ethtool_ops = { - .get_drvinfo = asix_get_drvinfo, + .get_drvinfo = usbnet_get_drvinfo, .get_link = usbnet_get_link, .get_msglevel = usbnet_get_msglevel, .set_msglevel = usbnet_set_msglevel, @@ -985,7 +985,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_drvinfo = usbnet_get_drvinfo, .get_link = asix_get_link, .get_msglevel = usbnet_get_msglevel, .set_msglevel = usbnet_set_msglevel, @@ -1642,7 +1642,5 @@ static struct usb_driver asix_driver = { module_usb_driver(asix_driver); MODULE_AUTHOR("David Hollis"); -MODULE_VERSION(DRIVER_VERSION); MODULE_DESCRIPTION("ASIX AX8817X based USB 2.0 Ethernet Devices"); MODULE_LICENSE("GPL"); - diff --git a/drivers/net/usb/ax88172a.c b/drivers/net/usb/ax88172a.c index 758a423a459b..3100fbe153c0 100644 --- a/drivers/net/usb/ax88172a.c +++ b/drivers/net/usb/ax88172a.c @@ -114,7 +114,7 @@ static const struct net_device_ops ax88172a_netdev_ops = { }; static const struct ethtool_ops ax88172a_ethtool_ops = { - .get_drvinfo = asix_get_drvinfo, + .get_drvinfo = usbnet_get_drvinfo, .get_link = usbnet_get_link, .get_msglevel = usbnet_get_msglevel, .set_msglevel = usbnet_set_msglevel, diff --git a/drivers/net/usb/catc.c b/drivers/net/usb/catc.c index 6759388692f8..5c7f19cbacf6 100644 --- a/drivers/net/usb/catc.c +++ b/drivers/net/usb/catc.c @@ -37,14 +37,8 @@ #include -/* - * Version information. - */ - -#define DRIVER_VERSION "v2.8" #define DRIVER_AUTHOR "Vojtech Pavlik " #define DRIVER_DESC "CATC EL1210A NetMate USB Ethernet driver" -#define SHORT_DRIVER_DESC "EL1210A NetMate USB Ethernet" MODULE_AUTHOR(DRIVER_AUTHOR); MODULE_DESCRIPTION(DRIVER_DESC); @@ -673,7 +667,6 @@ static void catc_get_drvinfo(struct net_device *dev, { struct catc *catc = netdev_priv(dev); strscpy(info->driver, driver_name, sizeof(info->driver)); - strscpy(info->version, DRIVER_VERSION, sizeof(info->version)); usb_make_path(catc->usbdev, info->bus_info, sizeof(info->bus_info)); } diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c index 2b4716ccf0c5..43fae1959547 100644 --- a/drivers/net/usb/dm9601.c +++ b/drivers/net/usb/dm9601.c @@ -259,13 +259,6 @@ static void dm9601_mdio_write(struct net_device *netdev, int phy_id, int loc, dm_write_shared_word(dev, 1, loc, res); } -static void dm9601_get_drvinfo(struct net_device *net, - struct ethtool_drvinfo *info) -{ - /* Inherit standard device info */ - usbnet_get_drvinfo(net, info); -} - static u32 dm9601_get_link(struct net_device *net) { struct usbnet *dev = netdev_priv(net); @@ -281,7 +274,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_drvinfo = usbnet_get_drvinfo, .get_link = dm9601_get_link, .get_msglevel = usbnet_get_msglevel, .set_msglevel = usbnet_set_msglevel, diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c index fdda0616704e..3a551ad363d0 100644 --- a/drivers/net/usb/mcs7830.c +++ b/drivers/net/usb/mcs7830.c @@ -438,11 +438,6 @@ static int mcs7830_get_regs_len(struct net_device *net) return 0; } -static void mcs7830_get_drvinfo(struct net_device *net, struct ethtool_drvinfo *drvinfo) -{ - usbnet_get_drvinfo(net, drvinfo); -} - static void mcs7830_get_regs(struct net_device *net, struct ethtool_regs *regs, void *data) { struct usbnet *dev = netdev_priv(net); @@ -452,11 +447,11 @@ static void mcs7830_get_regs(struct net_device *net, struct ethtool_regs *regs, } static const struct ethtool_ops mcs7830_ethtool_ops = { - .get_drvinfo = mcs7830_get_drvinfo, .get_regs_len = mcs7830_get_regs_len, .get_regs = mcs7830_get_regs, /* common usbnet calls */ + .get_drvinfo = usbnet_get_drvinfo, .get_link = usbnet_get_link, .get_msglevel = usbnet_get_msglevel, .set_msglevel = usbnet_set_msglevel, diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c index c514483134f0..7b6d6eb60709 100644 --- a/drivers/net/usb/pegasus.c +++ b/drivers/net/usb/pegasus.c @@ -18,9 +18,6 @@ #include #include "pegasus.h" -/* - * Version Information - */ #define DRIVER_AUTHOR "Petko Manolov " #define DRIVER_DESC "Pegasus/Pegasus II USB Ethernet driver" diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index 880b59ed5422..e8e6689d2c70 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -30,13 +30,6 @@ #include #include -/* Information for net-next */ -#define NETNEXT_VERSION "12" - -/* Information for net */ -#define NET_VERSION "13" - -#define DRIVER_VERSION "v1." NETNEXT_VERSION "." NET_VERSION #define DRIVER_AUTHOR "Realtek linux nic maintainers " #define DRIVER_DESC "Realtek RTL8152/RTL8153 Based USB Ethernet Adapters" #define MODULENAME "r8152" @@ -8756,7 +8749,6 @@ static void rtl8152_get_drvinfo(struct net_device *netdev, struct r8152 *tp = netdev_priv(netdev); strscpy(info->driver, MODULENAME, sizeof(info->driver)); - strscpy(info->version, DRIVER_VERSION, sizeof(info->version)); usb_make_path(tp->udev, info->bus_info, sizeof(info->bus_info)); if (!IS_ERR_OR_NULL(tp->rtl_fw.fw)) strscpy(info->fw_version, tp->rtl_fw.version, @@ -9950,7 +9942,6 @@ static int rtl8152_probe_once(struct usb_interface *intf, goto out2; set_bit(PROBED_WITH_NO_ERRORS, &tp->flags); - netif_info(tp, probe, netdev, "%s\n", DRIVER_VERSION); return 0; @@ -10145,4 +10136,3 @@ module_exit(rtl8152_driver_exit); MODULE_AUTHOR(DRIVER_AUTHOR); MODULE_DESCRIPTION(DRIVER_DESC); MODULE_LICENSE("GPL"); -MODULE_VERSION(DRIVER_VERSION); diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c index e40b0669d9f4..2f1f134b5b48 100644 --- a/drivers/net/usb/rtl8150.c +++ b/drivers/net/usb/rtl8150.c @@ -13,8 +13,6 @@ #include #include -/* Version Information */ -#define DRIVER_VERSION "v0.6.2 (2004/08/27)" #define DRIVER_AUTHOR "Petko Manolov " #define DRIVER_DESC "rtl8150 based usb-ethernet driver" @@ -785,7 +783,6 @@ static void rtl8150_get_drvinfo(struct net_device *netdev, struct ethtool_drvinf rtl8150_t *dev = netdev_priv(netdev); strscpy(info->driver, driver_name, sizeof(info->driver)); - strscpy(info->version, DRIVER_VERSION, sizeof(info->version)); usb_make_path(dev->udev, info->bus_info, sizeof(info->bus_info)); } diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c index 36c73db44f77..3ca60ebdd468 100644 --- a/drivers/net/usb/sierra_net.c +++ b/drivers/net/usb/sierra_net.c @@ -12,10 +12,8 @@ * Sierra Wireless. Use at your own risk. */ -#define DRIVER_VERSION "v.2.0" #define DRIVER_AUTHOR "Paxton Smith, Matthew Safar, Rory Filer" #define DRIVER_DESC "USB-to-WWAN Driver for Sierra Wireless modems" -static const char driver_name[] = "sierra_net"; /* if defined debug messages enabled */ /*#define DEBUG*/ @@ -607,15 +605,6 @@ static void sierra_net_status(struct usbnet *dev, struct urb *urb) } } -static void sierra_net_get_drvinfo(struct net_device *net, - struct ethtool_drvinfo *info) -{ - /* Inherit standard device info */ - usbnet_get_drvinfo(net, info); - strscpy(info->driver, driver_name, sizeof(info->driver)); - strscpy(info->version, DRIVER_VERSION, sizeof(info->version)); -} - static u32 sierra_net_get_link(struct net_device *net) { struct usbnet *dev = netdev_priv(net); @@ -624,7 +613,7 @@ static u32 sierra_net_get_link(struct net_device *net) } static const struct ethtool_ops sierra_net_ethtool_ops = { - .get_drvinfo = sierra_net_get_drvinfo, + .get_drvinfo = usbnet_get_drvinfo, .get_link = sierra_net_get_link, .get_msglevel = usbnet_get_msglevel, .set_msglevel = usbnet_set_msglevel, @@ -973,5 +962,4 @@ module_usb_driver(sierra_net_driver); MODULE_AUTHOR(DRIVER_AUTHOR); MODULE_DESCRIPTION(DRIVER_DESC); -MODULE_VERSION(DRIVER_VERSION); MODULE_LICENSE("GPL"); diff --git a/drivers/net/usb/smsc75xx.c b/drivers/net/usb/smsc75xx.c index 78c821349f48..fbc9d796f605 100644 --- a/drivers/net/usb/smsc75xx.c +++ b/drivers/net/usb/smsc75xx.c @@ -21,7 +21,6 @@ #include "smsc75xx.h" #define SMSC_CHIPNAME "smsc75xx" -#define SMSC_DRIVER_VERSION "1.0.0" #define HS_USB_PKT_SIZE (512) #define FS_USB_PKT_SIZE (64) #define DEFAULT_HS_BURST_CAP_SIZE (16 * 1024 + 5 * HS_USB_PKT_SIZE) @@ -1447,8 +1446,6 @@ static int smsc75xx_bind(struct usbnet *dev, struct usb_interface *intf) struct smsc75xx_priv *pdata = NULL; int ret; - printk(KERN_INFO SMSC_CHIPNAME " v" SMSC_DRIVER_VERSION "\n"); - ret = usbnet_get_endpoints(dev, intf); if (ret < 0) { netdev_warn(dev->net, "usbnet_get_endpoints failed: %d\n", ret); diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c index de733e0488bf..488eac211a91 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c @@ -27,7 +27,6 @@ #include "smsc95xx.h" #define SMSC_CHIPNAME "smsc95xx" -#define SMSC_DRIVER_VERSION "2.0.0" #define HS_USB_PKT_SIZE (512) #define FS_USB_PKT_SIZE (64) #define DEFAULT_HS_BURST_CAP_SIZE (16 * 1024 + 5 * HS_USB_PKT_SIZE) @@ -1160,8 +1159,6 @@ static int smsc95xx_bind(struct usbnet *dev, struct usb_interface *intf) int ret, phy_irq; u32 val; - printk(KERN_INFO SMSC_CHIPNAME " v" SMSC_DRIVER_VERSION "\n"); - ret = usbnet_get_endpoints(dev, intf); if (ret < 0) { netdev_warn(dev->net, "usbnet_get_endpoints failed: %d\n", ret); diff --git a/drivers/net/usb/sr9800.c b/drivers/net/usb/sr9800.c index 57947a5590cc..1a2cce6f275e 100644 --- a/drivers/net/usb/sr9800.c +++ b/drivers/net/usb/sr9800.c @@ -469,15 +469,6 @@ static int sr_get_eeprom(struct net_device *net, return 0; } -static void sr_get_drvinfo(struct net_device *net, - struct ethtool_drvinfo *info) -{ - /* Inherit standard device info */ - usbnet_get_drvinfo(net, info); - strscpy(info->driver, DRIVER_NAME, sizeof(info->driver)); - strscpy(info->version, DRIVER_VERSION, sizeof(info->version)); -} - static u32 sr_get_link(struct net_device *net) { struct usbnet *dev = netdev_priv(net); @@ -518,7 +509,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_drvinfo = usbnet_get_drvinfo, .get_link = sr_get_link, .get_msglevel = usbnet_get_msglevel, .set_msglevel = usbnet_set_msglevel, @@ -872,6 +863,5 @@ static struct usb_driver sr_driver = { module_usb_driver(sr_driver); MODULE_AUTHOR("Liu Junliang