net: usb: remove unnecessary get_drvinfo code and driver versions

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: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Peter Korsgaard <peter@korsgaard.com> (for dm9601.c)
Signed-off-by: Ethan Nelson-Moore <enelsonmoore@gmail.com>
Link: https://patch.msgid.link/20260129042435.13395-2-enelsonmoore@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/usb/aqc111.c b/drivers/net/usb/aqc111.c
index 9201ee10a13f785ae8df0d45489c05ed712f17c8..0722050dbe32374622e2540d8ace52d9744bd509 100644 (file)
--- 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 8531b804021aa4f7e4bba8a8f2c5e5e7173daa9e..cf97bc3d388b668b3ee9ebf2677299f4d412f481 100644 (file)
--- a/drivers/net/usb/asix.h
+++ b/drivers/net/usb/asix.h
@@ -29,7 +29,6 @@
 #include <net/selftests.h>
 #include <linux/phylink.h>
 
-#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 6ab3486072cb0f5edd182644e084a8a05c97ec94..4f03f4e57655df28786052559f8247050a7cd809 100644 (file)
--- a/drivers/net/usb/asix_common.c
+++ b/drivers/net/usb/asix_common.c
@@ -731,14 +731,6 @@ free:
        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 c73cf52a65a89457f03b55632448d4ad252468d0..d8744291d84349e30e18e821f99960c8bc1fce40 100644 (file)
--- a/drivers/net/usb/asix_devices.c
+++ b/drivers/net/usb/asix_devices.c
@@ -108,7 +108,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               = usbnet_get_link,
        .get_msglevel           = usbnet_get_msglevel,
        .set_msglevel           = usbnet_set_msglevel,
@@ -317,7 +317,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,
@@ -978,7 +978,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               = usbnet_get_link,
        .get_msglevel           = usbnet_get_msglevel,
        .set_msglevel           = usbnet_set_msglevel,
@@ -1635,7 +1635,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 758a423a459b80758f62f608daab84f3827522ac..3100fbe153c02941c4a6a2f450f187dbd4819f73 100644 (file)
--- 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 6759388692f8e98937ff39e002fcf332c90065f0..5c7f19cbacf619bee958a98a672962afefb2077f 100644 (file)
--- a/drivers/net/usb/catc.c
+++ b/drivers/net/usb/catc.c
@@ -37,14 +37,8 @@
 
 #include <linux/usb.h>
 
-/*
- * Version information.
- */
-
-#define DRIVER_VERSION "v2.8"
 #define DRIVER_AUTHOR "Vojtech Pavlik <vojtech@suse.cz>"
 #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 5540f7ec490684e23581751b61a817d189338eca..9e5649cefcbc20e6dd6fdf19c6e44a71fe0fe26f 100644 (file)
--- 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 int dm9601_ioctl(struct net_device *net, struct ifreq *rq, int cmd)
 {
        struct usbnet *dev = netdev_priv(net);
@@ -274,7 +267,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       = usbnet_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 fdda0616704eae350553af5ef212b4b234da0bf5..3a551ad363d063b5b3e331b3f35195682e3a732e 100644 (file)
--- 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 c514483134f05f31a76b7b8d69db1f5256d34ace..7b6d6eb6070999dd7c600ed9d7296cb3c22566c2 100644 (file)
--- a/drivers/net/usb/pegasus.c
+++ b/drivers/net/usb/pegasus.c
@@ -18,9 +18,6 @@
 #include <linux/uaccess.h>
 #include "pegasus.h"
 
-/*
- * Version Information
- */
 #define DRIVER_AUTHOR "Petko Manolov <petkan@nucleusys.com>"
 #define DRIVER_DESC "Pegasus/Pegasus II USB Ethernet driver"
 

diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index 880b59ed54226802a642693eaa9520805889650f..e8e6689d2c70290bd6375dd42a4ddce772fd2929 100644 (file)
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -30,13 +30,6 @@
 #include <linux/usb/r8152.h>
 #include <net/gso.h>
 
-/* 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 <nic_swsd@realtek.com>"
 #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 e40b0669d9f4bad3561de3846f0d4288459d2086..2f1f134b5b4834e8c0df569d02ae1d135166d28a 100644 (file)
--- a/drivers/net/usb/rtl8150.c
+++ b/drivers/net/usb/rtl8150.c
@@ -13,8 +13,6 @@
 #include <linux/usb.h>
 #include <linux/uaccess.h>
 
-/* Version Information */
-#define DRIVER_VERSION "v0.6.2 (2004/08/27)"
 #define DRIVER_AUTHOR "Petko Manolov <petkan@users.sourceforge.net>"
 #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 36c73db44f770f4177c6eb84d298d9585733b224..3ca60ebdd46818874ba58ce3da4b0f70cdcb3141 100644 (file)
--- 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 78c821349f484c4b21b9ebf08bb46b21d7e0bf77..fbc9d796f605680c4c1227647086ba9eaeaa8999 100644 (file)
--- 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 c65402d850c98d68168cf4b3a87254e6c60940bf..7ecf98d97493c0bdf94f6393283cb79ea2a2fedf 100644 (file)
--- 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)
@@ -1152,8 +1151,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 ee8c6c9d3962c78f513d3219c7a8fc76b11f1455..e3f6233e5866f8d74b505508b7efe7859e7c85b8 100644 (file)
--- 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 int sr_ioctl(struct net_device *net, struct ifreq *rq, int cmd)
 {
        struct usbnet *dev = netdev_priv(net);
@@ -511,7 +502,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       = usbnet_get_link,
        .get_msglevel   = usbnet_get_msglevel,
        .set_msglevel   = usbnet_set_msglevel,
@@ -865,6 +856,5 @@ static struct usb_driver sr_driver = {
 module_usb_driver(sr_driver);
 
 MODULE_AUTHOR("Liu Junliang <liujunliang_ljl@163.com");
-MODULE_VERSION(DRIVER_VERSION);
 MODULE_DESCRIPTION("SR9800 USB 2.0 USB2NET Dev : http://www.corechip-sz.com");
 MODULE_LICENSE("GPL");

diff --git a/drivers/net/usb/sr9800.h b/drivers/net/usb/sr9800.h
index 952e6f7c03211b595f48f22e3af0adc6c9fb73c2..98ac1c45740efe5f7bdf8c31f4fa05baf5942006 100644 (file)
--- a/drivers/net/usb/sr9800.h
+++ b/drivers/net/usb/sr9800.h
@@ -147,8 +147,7 @@
 #define SR_EEPROM_MAGIC                        0xdeadbeef
 #define SR9800_EEPROM_LEN              0xff
 
-/* SR9800 Driver Version and Driver Name */
-#define DRIVER_VERSION                 "11-Nov-2013"
+/* SR9800 Driver Name and Flags */
 #define DRIVER_NAME                    "CoreChips"
 #define        DRIVER_FLAG             \
        (FLAG_ETHER | FLAG_FRAMING_AX | FLAG_LINK_INTR |  FLAG_MULTI_PACKET)