From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qv1-f65.google.com (mail-qv1-f65.google.com [209.85.219.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 554082DFF19 for ; Sat, 24 Jan 2026 12:02:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.65 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769256165; cv=none; b=hBBPWp6QtLlwqJ3GjukE05Z0Z/XGm0icb7jx2ya2K9NyOd8wcvbnnVaKJ0Dfxu440lJ1aNHdHMoxfiO7grz+c4wcNARpgiLkaxyiAFOlfqIpYPhdLp2hiyFEGKMhVtDHMa0vn3kOqP/StFrUG5fTtql4yml8YrOuPBztD/2z54U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769256165; c=relaxed/simple; bh=heP1ML7tjjUv9PKBY/ChkP+I3d6ogSa7ReEOPSNsE5Q=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=ssLisDl0z+CI5Fxj95IhypfOO5hno0Su6MLWNZFByW5b8GFoABeOcas/LCqYqpfcP+aEIDsJTK09QAlJJ5OKp9EhM8gWawO9rLvNMOngQDJvH4Ty3zEABzAsDcAknovFWrxysHfyQKVswodoDNYpcpYNfV0WNrs4/emG1gMEDSs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=XDjiwpi4; arc=none smtp.client-ip=209.85.219.65 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XDjiwpi4" Received: by mail-qv1-f65.google.com with SMTP id 6a1803df08f44-88a367a1dbbso56815646d6.0 for ; Sat, 24 Jan 2026 04:02:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769256162; x=1769860962; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=K/Tw0p7eRethPFw5iDGC5ew17rOkbzu0EoSUygIY5nI=; b=XDjiwpi4W3XUQWzynJWcFAFnKT2eI/yTbvWCTcglTtTfGN1jhk6lMuD3z/MOCpc85o t2jkZi0vLoT6WTUaAGD9YE50jbOEsUvxyFZ/34VaOBLB2Evaqqid4DH+sZpiKT/ZvOU4 iw0hb1Z1uPR8NKF3RnczgRQBl3sYsLbu4srCtiJQ0VLIniAuFRDEV9UlzyI2aTYycvJe KH4uy7JvEh9amSp2E5bYPyGAJJKhdaznmTuZM+3WuDJUAmlViRjFQFcpUn9ojNpYYH9G Ndm55l1AciSXO+jl/yW2GVLzjeMl9ZtzlG2brZSMGkRCaIfZ4Ffrz+8RFIlBVt/JOvOq De7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769256162; x=1769860962; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=K/Tw0p7eRethPFw5iDGC5ew17rOkbzu0EoSUygIY5nI=; b=GswiEjPQ9udNpiI5tW2caxWZxAZzCyKO/I9TEEyc/19tYoewZ54HqQTpdGZdkIAErR buwFCwHr1bfTQQGK4fB2teTk2f+3whoambNbN6NDXA4iaTCDXFCuDZ3Zg6wiyRTQWbPy Ftc9sUG7ZbYahORIgwsyjYGqypQDwG+C9QZC3GFRK1OM0uZCdTjHQx9NzfbWAuv3ylMo Kn4ScqRqWbj2FMPLXPGW1fy7OyTHeSc4kI2MmKet8H8UQtqdSeZMFQDDFf9BjKQxDH1x y+iE8NS6CZWa3GfgP2KaH5L4rYtHwvcclH/5caMR/V6RlWj42Gxu/cqHOuhnj8XdJJPj tclg== X-Gm-Message-State: AOJu0YzadlIyaNm1IjZBxlku8Fuxkjjr+IwcN80QnG0AcznJF3xvEHkB B4iYL3RVNvg0KMRmo+8cEwKJ0bKgT24gFf3Af2EdxM4ar8kvDjMIFI/Vq2V+JN+I X-Gm-Gg: AZuq6aI5mfdeGnGKgE5DQ3I5ku71cH/7WKwENEiq6b1P7nuTSKZMo7R2mJB5vpf9GEj DZ7k2tdQpZHJDmLEC2JWXB9Y4ftaD00B+6WSVHqOCIdU8mDkv+dFPL1EUIkbnhyOvAWkJGHsEA3 5xITqtE+aof46x9R6VE76MIpzfDKfPc2MDvHNjO/OJlK1FJ5dX1TLqCpu5Zn7QnSp88I/GPBKKv joG8IqVtcjMH3xNfehxliOKQdrb7MVW9lULbhphFDBTlFW6wTKYASe90f6DWsTk3FYdBuuOKs0f V3E8jJXIZE0gEm/eWxIoF87hiT8vpAXY/t41e3E9EFVHmPlR0r4JNs03b+CplV56mkMgyu8ed9+ t/VOZJz4PYXcEhQpRuO9EErsaaHRTUYpg/+x6cSgaPhtiFDGzpyv0agQensuQjNHNtp8Sf4IvHn E+NiD0x6LwSU9JwZbazI82Tw0GV0p4QldvJA4nmFk3mrbJt+y4IkWFKjhd0pSp6C0H/7efZBajK ZVjciNFQfLKMrXUn1+vIUjie3QD5aaJLIJZon5CW+XzmQKgi0f12q90pjb3MO+CE0V7C7M6x1ka KyWp X-Received: by 2002:a05:7300:2155:b0:2ae:60fd:6f18 with SMTP id 5a478bee46e88-2b739b73f70mr3139776eec.22.1769250074000; Sat, 24 Jan 2026 02:21:14 -0800 (PST) Received: from ethan-latitude5420.. (host-127-24.cafrjco.fresno.ca.us.clients.pavlovmedia.net. [68.180.127.24]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2b73aa03ecasm6224611eec.27.2026.01.24.02.21.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Jan 2026 02:21:13 -0800 (PST) From: Ethan Nelson-Moore To: netdev@vger.kernel.org, linux-usb@vger.kernel.org Cc: Ethan Nelson-Moore , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Peter Korsgaard , Petko Manolov , Steve Glendinning , UNGLinuxDriver@microchip.com, Nikita Zhandarovich , Oliver Neukum , =?UTF-8?q?Krzysztof=20Ha=C5=82asa?= , Deepanshu Kartikey , Oleksij Rempel , Max Schulze , Andy Shevchenko , Thomas Gleixner , Ingo Molnar , "Gustavo A. R. Silva" , Kees Cook , Eric Biggers Subject: [PATCH v2 net-next] net: usb: remove unnecessary get_drvinfo code and driver versions Date: Sat, 24 Jan 2026 02:19:45 -0800 Message-ID: <20260124102042.112101-1-enelsonmoore@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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. Signed-off-by: Ethan Nelson-Moore --- 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