leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net/3com: Delete driver and module versions from 3com drivers

Browse Source 
There is no need to mislead users by providing different versions for
driver, ethtool and modules. Delete driver assignments and let use
the default one.

Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Leon Romanovsky 2020-02-24 10:52:56 +02:00 committed by David S. Miller
parent 562a7ef3bb
commit 6bba2e89a8
4 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/ethernet/3com/3c509.c
View File

@ -60,8 +60,6 @@
*/ */
#define DRV_NAME "3c509" #define DRV_NAME "3c509"
#define DRV_VERSION "1.20"
#define DRV_RELDATE "04Feb2008"
/* A few values that may be tweaked. */ /* A few values that may be tweaked. */
@ -87,13 +85,12 @@
#include <linux/device.h> #include <linux/device.h>
#include <linux/eisa.h> #include <linux/eisa.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/vermagic.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/irq.h> #include <asm/irq.h>
static char version[] = DRV_NAME ".c:" DRV_VERSION " " DRV_RELDATE " becker@scyld.com\n";
#ifdef EL3_DEBUG #ifdef EL3_DEBUG
static int el3_debug = EL3_DEBUG; static int el3_debug = EL3_DEBUG;
#else #else
@ -547,8 +544,6 @@ static int el3_common_init(struct net_device *dev)
dev->name, dev->base_addr, if_names[(dev->if_port & 0x03)], dev->name, dev->base_addr, if_names[(dev->if_port & 0x03)],
dev->dev_addr, dev->irq); dev->dev_addr, dev->irq);
if (el3_debug > 0)
pr_info("%s", version);
return 0; return 0;
} }
@ -1143,7 +1138,6 @@ el3_netdev_set_ecmd(struct net_device *dev,
static void el3_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) static void el3_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
{ {
strlcpy(info->driver, DRV_NAME, sizeof(info->driver)); strlcpy(info->driver, DRV_NAME, sizeof(info->driver));
strlcpy(info->version, DRV_VERSION, sizeof(info->version));
} }
static int el3_get_link_ksettings(struct net_device *dev, static int el3_get_link_ksettings(struct net_device *dev,

16
drivers/net/ethernet/3com/3c515.c
View File

@ -22,12 +22,8 @@
*/ */
#include <linux/vermagic.h>
#define DRV_NAME "3c515" #define DRV_NAME "3c515"
#define DRV_VERSION "0.99t-ac"
#define DRV_RELDATE "28-Oct-2002"
static char *version =
DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " becker@scyld.com and others\n";
#define CORKSCREW 1 #define CORKSCREW 1
@ -84,7 +80,6 @@ static int max_interrupt_work = 20;
MODULE_AUTHOR("Donald Becker <becker@scyld.com>"); MODULE_AUTHOR("Donald Becker <becker@scyld.com>");
MODULE_DESCRIPTION("3Com 3c515 Corkscrew driver"); MODULE_DESCRIPTION("3Com 3c515 Corkscrew driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);
/* "Knobs" for adjusting internal parameters. */ /* "Knobs" for adjusting internal parameters. */
/* Put out somewhat more debugging messages. (0 - no msg, 1 minimal msgs). */ /* Put out somewhat more debugging messages. (0 - no msg, 1 minimal msgs). */
@ -418,8 +413,6 @@ int init_module(void)
int found = 0; int found = 0;
if (debug >= 0) if (debug >= 0)
corkscrew_debug = debug; corkscrew_debug = debug;
if (corkscrew_debug)
pr_debug("%s", version);
while (corkscrew_scan(-1)) while (corkscrew_scan(-1))
found++; found++;
return found ? 0 : -ENODEV; return found ? 0 : -ENODEV;
@ -429,16 +422,10 @@ int init_module(void)
struct net_device *tc515_probe(int unit) struct net_device *tc515_probe(int unit)
{ {
struct net_device *dev = corkscrew_scan(unit); struct net_device *dev = corkscrew_scan(unit);
static int printed;
if (!dev) if (!dev)
return ERR_PTR(-ENODEV); return ERR_PTR(-ENODEV);
if (corkscrew_debug > 0 && !printed) {
printed = 1;
pr_debug("%s", version);
}
return dev; return dev;
} }
#endif /* not MODULE */ #endif /* not MODULE */
@ -1540,7 +1527,6 @@ static void netdev_get_drvinfo(struct net_device *dev,
struct ethtool_drvinfo *info) struct ethtool_drvinfo *info)
{ {
strlcpy(info->driver, DRV_NAME, sizeof(info->driver)); strlcpy(info->driver, DRV_NAME, sizeof(info->driver));
strlcpy(info->version, DRV_VERSION, sizeof(info->version));
snprintf(info->bus_info, sizeof(info->bus_info), "ISA 0x%lx", snprintf(info->bus_info, sizeof(info->bus_info), "ISA 0x%lx",
dev->base_addr); dev->base_addr);
} }

2
drivers/net/ethernet/3com/3c589_cs.c
View File

@ -23,7 +23,6 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#define DRV_NAME "3c589_cs" #define DRV_NAME "3c589_cs"
#define DRV_VERSION "1.162-ac"
#include <linux/module.h> #include <linux/module.h>
#include <linux/kernel.h> #include <linux/kernel.h>
@ -482,7 +481,6 @@ static void netdev_get_drvinfo(struct net_device *dev,
struct ethtool_drvinfo *info) struct ethtool_drvinfo *info)
{ {
strlcpy(info->driver, DRV_NAME, sizeof(info->driver)); strlcpy(info->driver, DRV_NAME, sizeof(info->driver));
strlcpy(info->version, DRV_VERSION, sizeof(info->version));
snprintf(info->bus_info, sizeof(info->bus_info), snprintf(info->bus_info, sizeof(info->bus_info),
"PCMCIA 0x%lx", dev->base_addr); "PCMCIA 0x%lx", dev->base_addr);
} }

1
drivers/net/ethernet/3com/typhoon.c
View File

@ -127,7 +127,6 @@ static const int multicast_filter_limit = 32;
#include "typhoon.h" #include "typhoon.h"
MODULE_AUTHOR("David Dillow <dave@thedillows.org>"); MODULE_AUTHOR("David Dillow <dave@thedillows.org>");
MODULE_VERSION("1.0");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_FIRMWARE(FIRMWARE_NAME); MODULE_FIRMWARE(FIRMWARE_NAME);
MODULE_DESCRIPTION("3Com Typhoon Family (3C990, 3CR990, and variants)"); MODULE_DESCRIPTION("3Com Typhoon Family (3C990, 3CR990, and variants)");