Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
authored by
Ethan Nelson-Moore
and committed by
Jakub Kicinski
44ecaff5
96e1c895
+9
-91
-5
drivers/net/usb/aqc111.c
-5
drivers/net/usb/aqc111.c
···
20
20
21
21
#include "aqc111.h"
22
22
23
-
#define DRIVER_NAME "aqc111"
24
-
25
23
static int aqc111_read_cmd_nopm(struct usbnet *dev, u8 cmd, u16 value,
26
24
u16 index, u16 size, void *data)
27
25
{
···
205
207
206
208
/* Inherit standard device info */
207
209
usbnet_get_drvinfo(net, info);
208
-
strscpy(info->driver, DRIVER_NAME, sizeof(info->driver));
209
210
snprintf(info->fw_version, sizeof(info->fw_version), "%u.%u.%u",
210
211
aqc111_data->fw_ver.major,
211
212
aqc111_data->fw_ver.minor,
212
213
aqc111_data->fw_ver.rev);
213
-
info->eedump_len = 0x00;
214
-
info->regdump_len = 0x00;
215
214
}
216
215
217
216
static void aqc111_get_wol(struct net_device *net,
-3
drivers/net/usb/asix.h
-3
drivers/net/usb/asix.h
···
29
29
#include <net/selftests.h>
30
30
#include <linux/phylink.h>
31
31
32
-
#define DRIVER_VERSION "22-Dec-2011"
33
32
#define DRIVER_NAME "asix"
34
33
35
34
/* ASIX AX8817X based USB 2.0 Ethernet Devices */
···
246
247
u8 *data);
247
248
int asix_set_eeprom(struct net_device *net, struct ethtool_eeprom *eeprom,
248
249
u8 *data);
249
-
250
-
void asix_get_drvinfo(struct net_device *net, struct ethtool_drvinfo *info);
251
250
252
251
int asix_set_mac_address(struct net_device *net, void *p);
253
252
-8
drivers/net/usb/asix_common.c
-8
drivers/net/usb/asix_common.c
···
731
731
return ret;
732
732
}
733
733
734
-
void asix_get_drvinfo(struct net_device *net, struct ethtool_drvinfo *info)
735
-
{
736
-
/* Inherit standard device info */
737
-
usbnet_get_drvinfo(net, info);
738
-
strscpy(info->driver, DRIVER_NAME, sizeof(info->driver));
739
-
strscpy(info->version, DRIVER_VERSION, sizeof(info->version));
740
-
}
741
-
742
734
int asix_set_mac_address(struct net_device *net, void *p)
743
735
{
744
736
struct usbnet *dev = netdev_priv(net);
+3
-5
drivers/net/usb/asix_devices.c
+3
-5
drivers/net/usb/asix_devices.c
···
108
108
own structure so we don't interfere with other usbnet
109
109
devices that may be connected at the same time. */
110
110
static const struct ethtool_ops ax88172_ethtool_ops = {
111
-
.get_drvinfo = asix_get_drvinfo,
111
+
.get_drvinfo = usbnet_get_drvinfo,
112
112
.get_link = usbnet_get_link,
113
113
.get_msglevel = usbnet_get_msglevel,
114
114
.set_msglevel = usbnet_set_msglevel,
···
317
317
}
318
318
319
319
static const struct ethtool_ops ax88772_ethtool_ops = {
320
-
.get_drvinfo = asix_get_drvinfo,
320
+
.get_drvinfo = usbnet_get_drvinfo,
321
321
.get_link = usbnet_get_link,
322
322
.get_msglevel = usbnet_get_msglevel,
323
323
.set_msglevel = usbnet_set_msglevel,
···
978
978
}
979
979
980
980
static const struct ethtool_ops ax88178_ethtool_ops = {
981
-
.get_drvinfo = asix_get_drvinfo,
981
+
.get_drvinfo = usbnet_get_drvinfo,
982
982
.get_link = usbnet_get_link,
983
983
.get_msglevel = usbnet_get_msglevel,
984
984
.set_msglevel = usbnet_set_msglevel,
···
1635
1635
module_usb_driver(asix_driver);
1636
1636
1637
1637
MODULE_AUTHOR("David Hollis");
1638
-
MODULE_VERSION(DRIVER_VERSION);
1639
1638
MODULE_DESCRIPTION("ASIX AX8817X based USB 2.0 Ethernet Devices");
1640
1639
MODULE_LICENSE("GPL");
1641
-
+1
-1
drivers/net/usb/ax88172a.c
+1
-1
drivers/net/usb/ax88172a.c
-7
drivers/net/usb/catc.c
-7
drivers/net/usb/catc.c
···
37
37
38
38
#include <linux/usb.h>
39
39
40
-
/*
41
-
* Version information.
42
-
*/
43
-
44
-
#define DRIVER_VERSION "v2.8"
45
40
#define DRIVER_AUTHOR "Vojtech Pavlik <vojtech@suse.cz>"
46
41
#define DRIVER_DESC "CATC EL1210A NetMate USB Ethernet driver"
47
-
#define SHORT_DRIVER_DESC "EL1210A NetMate USB Ethernet"
48
42
49
43
MODULE_AUTHOR(DRIVER_AUTHOR);
50
44
MODULE_DESCRIPTION(DRIVER_DESC);
···
667
673
{
668
674
struct catc *catc = netdev_priv(dev);
669
675
strscpy(info->driver, driver_name, sizeof(info->driver));
670
-
strscpy(info->version, DRIVER_VERSION, sizeof(info->version));
671
676
usb_make_path(catc->usbdev, info->bus_info, sizeof(info->bus_info));
672
677
}
673
678
+1
-8
drivers/net/usb/dm9601.c
+1
-8
drivers/net/usb/dm9601.c
···
259
259
dm_write_shared_word(dev, 1, loc, res);
260
260
}
261
261
262
-
static void dm9601_get_drvinfo(struct net_device *net,
263
-
struct ethtool_drvinfo *info)
264
-
{
265
-
/* Inherit standard device info */
266
-
usbnet_get_drvinfo(net, info);
267
-
}
268
-
269
262
static int dm9601_ioctl(struct net_device *net, struct ifreq *rq, int cmd)
270
263
{
271
264
struct usbnet *dev = netdev_priv(net);
···
267
274
}
268
275
269
276
static const struct ethtool_ops dm9601_ethtool_ops = {
270
-
.get_drvinfo = dm9601_get_drvinfo,
277
+
.get_drvinfo = usbnet_get_drvinfo,
271
278
.get_link = usbnet_get_link,
272
279
.get_msglevel = usbnet_get_msglevel,
273
280
.set_msglevel = usbnet_set_msglevel,
+1
-6
drivers/net/usb/mcs7830.c
+1
-6
drivers/net/usb/mcs7830.c
···
438
438
return 0;
439
439
}
440
440
441
-
static void mcs7830_get_drvinfo(struct net_device *net, struct ethtool_drvinfo *drvinfo)
442
-
{
443
-
usbnet_get_drvinfo(net, drvinfo);
444
-
}
445
-
446
441
static void mcs7830_get_regs(struct net_device *net, struct ethtool_regs *regs, void *data)
447
442
{
448
443
struct usbnet *dev = netdev_priv(net);
···
447
452
}
448
453
449
454
static const struct ethtool_ops mcs7830_ethtool_ops = {
450
-
.get_drvinfo = mcs7830_get_drvinfo,
451
455
.get_regs_len = mcs7830_get_regs_len,
452
456
.get_regs = mcs7830_get_regs,
453
457
454
458
/* common usbnet calls */
459
+
.get_drvinfo = usbnet_get_drvinfo,
455
460
.get_link = usbnet_get_link,
456
461
.get_msglevel = usbnet_get_msglevel,
457
462
.set_msglevel = usbnet_set_msglevel,
-3
drivers/net/usb/pegasus.c
-3
drivers/net/usb/pegasus.c
-10
drivers/net/usb/r8152.c
-10
drivers/net/usb/r8152.c
···
30
30
#include <linux/usb/r8152.h>
31
31
#include <net/gso.h>
32
32
33
-
/* Information for net-next */
34
-
#define NETNEXT_VERSION "12"
35
-
36
-
/* Information for net */
37
-
#define NET_VERSION "13"
38
-
39
-
#define DRIVER_VERSION "v1." NETNEXT_VERSION "." NET_VERSION
40
33
#define DRIVER_AUTHOR "Realtek linux nic maintainers <nic_swsd@realtek.com>"
41
34
#define DRIVER_DESC "Realtek RTL8152/RTL8153 Based USB Ethernet Adapters"
42
35
#define MODULENAME "r8152"
···
8749
8756
struct r8152 *tp = netdev_priv(netdev);
8750
8757
8751
8758
strscpy(info->driver, MODULENAME, sizeof(info->driver));
8752
-
strscpy(info->version, DRIVER_VERSION, sizeof(info->version));
8753
8759
usb_make_path(tp->udev, info->bus_info, sizeof(info->bus_info));
8754
8760
if (!IS_ERR_OR_NULL(tp->rtl_fw.fw))
8755
8761
strscpy(info->fw_version, tp->rtl_fw.version,
···
9942
9950
goto out2;
9943
9951
9944
9952
set_bit(PROBED_WITH_NO_ERRORS, &tp->flags);
9945
-
netif_info(tp, probe, netdev, "%s\n", DRIVER_VERSION);
9946
9953
9947
9954
return 0;
9948
9955
···
10136
10145
MODULE_AUTHOR(DRIVER_AUTHOR);
10137
10146
MODULE_DESCRIPTION(DRIVER_DESC);
10138
10147
MODULE_LICENSE("GPL");
10139
-
MODULE_VERSION(DRIVER_VERSION);
-3
drivers/net/usb/rtl8150.c
-3
drivers/net/usb/rtl8150.c
···
13
13
#include <linux/usb.h>
14
14
#include <linux/uaccess.h>
15
15
16
-
/* Version Information */
17
-
#define DRIVER_VERSION "v0.6.2 (2004/08/27)"
18
16
#define DRIVER_AUTHOR "Petko Manolov <petkan@users.sourceforge.net>"
19
17
#define DRIVER_DESC "rtl8150 based usb-ethernet driver"
20
18
···
783
785
rtl8150_t *dev = netdev_priv(netdev);
784
786
785
787
strscpy(info->driver, driver_name, sizeof(info->driver));
786
-
strscpy(info->version, DRIVER_VERSION, sizeof(info->version));
787
788
usb_make_path(dev->udev, info->bus_info, sizeof(info->bus_info));
788
789
}
789
790
+1
-13
drivers/net/usb/sierra_net.c
+1
-13
drivers/net/usb/sierra_net.c
···
12
12
* Sierra Wireless. Use at your own risk.
13
13
*/
14
14
15
-
#define DRIVER_VERSION "v.2.0"
16
15
#define DRIVER_AUTHOR "Paxton Smith, Matthew Safar, Rory Filer"
17
16
#define DRIVER_DESC "USB-to-WWAN Driver for Sierra Wireless modems"
18
-
static const char driver_name[] = "sierra_net";
19
17
20
18
/* if defined debug messages enabled */
21
19
/*#define DEBUG*/
···
605
607
}
606
608
}
607
609
608
-
static void sierra_net_get_drvinfo(struct net_device *net,
609
-
struct ethtool_drvinfo *info)
610
-
{
611
-
/* Inherit standard device info */
612
-
usbnet_get_drvinfo(net, info);
613
-
strscpy(info->driver, driver_name, sizeof(info->driver));
614
-
strscpy(info->version, DRIVER_VERSION, sizeof(info->version));
615
-
}
616
-
617
610
static u32 sierra_net_get_link(struct net_device *net)
618
611
{
619
612
struct usbnet *dev = netdev_priv(net);
···
613
624
}
614
625
615
626
static const struct ethtool_ops sierra_net_ethtool_ops = {
616
-
.get_drvinfo = sierra_net_get_drvinfo,
627
+
.get_drvinfo = usbnet_get_drvinfo,
617
628
.get_link = sierra_net_get_link,
618
629
.get_msglevel = usbnet_get_msglevel,
619
630
.set_msglevel = usbnet_set_msglevel,
···
962
973
963
974
MODULE_AUTHOR(DRIVER_AUTHOR);
964
975
MODULE_DESCRIPTION(DRIVER_DESC);
965
-
MODULE_VERSION(DRIVER_VERSION);
966
976
MODULE_LICENSE("GPL");
-3
drivers/net/usb/smsc75xx.c
-3
drivers/net/usb/smsc75xx.c
···
21
21
#include "smsc75xx.h"
22
22
23
23
#define SMSC_CHIPNAME "smsc75xx"
24
-
#define SMSC_DRIVER_VERSION "1.0.0"
25
24
#define HS_USB_PKT_SIZE (512)
26
25
#define FS_USB_PKT_SIZE (64)
27
26
#define DEFAULT_HS_BURST_CAP_SIZE (16 * 1024 + 5 * HS_USB_PKT_SIZE)
···
1445
1446
{
1446
1447
struct smsc75xx_priv *pdata = NULL;
1447
1448
int ret;
1448
-
1449
-
printk(KERN_INFO SMSC_CHIPNAME " v" SMSC_DRIVER_VERSION "\n");
1450
1449
1451
1450
ret = usbnet_get_endpoints(dev, intf);
1452
1451
if (ret < 0) {
-3
drivers/net/usb/smsc95xx.c
-3
drivers/net/usb/smsc95xx.c
···
27
27
#include "smsc95xx.h"
28
28
29
29
#define SMSC_CHIPNAME "smsc95xx"
30
-
#define SMSC_DRIVER_VERSION "2.0.0"
31
30
#define HS_USB_PKT_SIZE (512)
32
31
#define FS_USB_PKT_SIZE (64)
33
32
#define DEFAULT_HS_BURST_CAP_SIZE (16 * 1024 + 5 * HS_USB_PKT_SIZE)
···
1150
1151
char usb_path[64];
1151
1152
int ret, phy_irq;
1152
1153
u32 val;
1153
-
1154
-
printk(KERN_INFO SMSC_CHIPNAME " v" SMSC_DRIVER_VERSION "\n");
1155
1154
1156
1155
ret = usbnet_get_endpoints(dev, intf);
1157
1156
if (ret < 0) {
+1
-11
drivers/net/usb/sr9800.c
+1
-11
drivers/net/usb/sr9800.c
···
469
469
return 0;
470
470
}
471
471
472
-
static void sr_get_drvinfo(struct net_device *net,
473
-
struct ethtool_drvinfo *info)
474
-
{
475
-
/* Inherit standard device info */
476
-
usbnet_get_drvinfo(net, info);
477
-
strscpy(info->driver, DRIVER_NAME, sizeof(info->driver));
478
-
strscpy(info->version, DRIVER_VERSION, sizeof(info->version));
479
-
}
480
-
481
472
static int sr_ioctl(struct net_device *net, struct ifreq *rq, int cmd)
482
473
{
483
474
struct usbnet *dev = netdev_priv(net);
···
502
511
}
503
512
504
513
static const struct ethtool_ops sr9800_ethtool_ops = {
505
-
.get_drvinfo = sr_get_drvinfo,
514
+
.get_drvinfo = usbnet_get_drvinfo,
506
515
.get_link = usbnet_get_link,
507
516
.get_msglevel = usbnet_get_msglevel,
508
517
.set_msglevel = usbnet_set_msglevel,
···
856
865
module_usb_driver(sr_driver);
857
866
858
867
MODULE_AUTHOR("Liu Junliang <liujunliang_ljl@163.com");
859
-
MODULE_VERSION(DRIVER_VERSION);
860
868
MODULE_DESCRIPTION("SR9800 USB 2.0 USB2NET Dev : http://www.corechip-sz.com");
861
869
MODULE_LICENSE("GPL");
+1
-2
drivers/net/usb/sr9800.h
+1
-2
drivers/net/usb/sr9800.h
···
147
147
#define SR_EEPROM_MAGIC 0xdeadbeef
148
148
#define SR9800_EEPROM_LEN 0xff
149
149
150
-
/* SR9800 Driver Version and Driver Name */
151
-
#define DRIVER_VERSION "11-Nov-2013"
150
+
/* SR9800 Driver Name and Flags */
152
151
#define DRIVER_NAME "CoreChips"
153
152
#define DRIVER_FLAG \
154
153
(FLAG_ETHER | FLAG_FRAMING_AX | FLAG_LINK_INTR | FLAG_MULTI_PACKET)