Commit 7f4d2537 authored by Leon Romanovsky's avatar Leon Romanovsky Committed by David S. Miller

net/amd: Remove useless driver version

Convert AMD drivers to respect universal linux kernel version.
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1a63443a
...@@ -84,9 +84,8 @@ Revision History: ...@@ -84,9 +84,8 @@ Revision History:
#include "amd8111e.h" #include "amd8111e.h"
#define MODULE_NAME "amd8111e" #define MODULE_NAME "amd8111e"
#define MODULE_VERS "3.0.7"
MODULE_AUTHOR("Advanced Micro Devices, Inc."); MODULE_AUTHOR("Advanced Micro Devices, Inc.");
MODULE_DESCRIPTION ("AMD8111 based 10/100 Ethernet Controller. Driver Version "MODULE_VERS); MODULE_DESCRIPTION("AMD8111 based 10/100 Ethernet Controller.");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
module_param_array(speed_duplex, int, NULL, 0); module_param_array(speed_duplex, int, NULL, 0);
MODULE_PARM_DESC(speed_duplex, "Set device speed and duplex modes, 0: Auto Negotiate, 1: 10Mbps Half Duplex, 2: 10Mbps Full Duplex, 3: 100Mbps Half Duplex, 4: 100Mbps Full Duplex"); MODULE_PARM_DESC(speed_duplex, "Set device speed and duplex modes, 0: Auto Negotiate, 1: 10Mbps Half Duplex, 2: 10Mbps Full Duplex, 3: 100Mbps Half Duplex, 4: 100Mbps Full Duplex");
...@@ -1366,7 +1365,6 @@ static void amd8111e_get_drvinfo(struct net_device *dev, ...@@ -1366,7 +1365,6 @@ static void amd8111e_get_drvinfo(struct net_device *dev,
struct amd8111e_priv *lp = netdev_priv(dev); struct amd8111e_priv *lp = netdev_priv(dev);
struct pci_dev *pci_dev = lp->pci_dev; struct pci_dev *pci_dev = lp->pci_dev;
strlcpy(info->driver, MODULE_NAME, sizeof(info->driver)); strlcpy(info->driver, MODULE_NAME, sizeof(info->driver));
strlcpy(info->version, MODULE_VERS, sizeof(info->version));
snprintf(info->fw_version, sizeof(info->fw_version), snprintf(info->fw_version, sizeof(info->fw_version),
"%u", chip_version); "%u", chip_version);
strlcpy(info->bus_info, pci_name(pci_dev), sizeof(info->bus_info)); strlcpy(info->bus_info, pci_name(pci_dev), sizeof(info->bus_info));
...@@ -1875,7 +1873,6 @@ static int amd8111e_probe_one(struct pci_dev *pdev, ...@@ -1875,7 +1873,6 @@ static int amd8111e_probe_one(struct pci_dev *pdev,
/* display driver and device information */ /* display driver and device information */
chip_version = (readl(lp->mmio + CHIPID) & 0xf0000000)>>28; chip_version = (readl(lp->mmio + CHIPID) & 0xf0000000)>>28;
dev_info(&pdev->dev, "AMD-8111e Driver Version: %s\n", MODULE_VERS);
dev_info(&pdev->dev, "[ Rev %x ] PCI 10/100BaseT Ethernet %pM\n", dev_info(&pdev->dev, "[ Rev %x ] PCI 10/100BaseT Ethernet %pM\n",
chip_version, dev->dev_addr); chip_version, dev->dev_addr);
if (lp->ext_phy_id) if (lp->ext_phy_id)
......
...@@ -63,14 +63,12 @@ static int au1000_debug = 3; ...@@ -63,14 +63,12 @@ static int au1000_debug = 3;
NETIF_MSG_LINK) NETIF_MSG_LINK)
#define DRV_NAME "au1000_eth" #define DRV_NAME "au1000_eth"
#define DRV_VERSION "1.7"
#define DRV_AUTHOR "Pete Popov <ppopov@embeddedalley.com>" #define DRV_AUTHOR "Pete Popov <ppopov@embeddedalley.com>"
#define DRV_DESC "Au1xxx on-chip Ethernet driver" #define DRV_DESC "Au1xxx on-chip Ethernet driver"
MODULE_AUTHOR(DRV_AUTHOR); MODULE_AUTHOR(DRV_AUTHOR);
MODULE_DESCRIPTION(DRV_DESC); MODULE_DESCRIPTION(DRV_DESC);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);
/* AU1000 MAC registers and bits */ /* AU1000 MAC registers and bits */
#define MAC_CONTROL 0x0 #define MAC_CONTROL 0x0
...@@ -656,7 +654,6 @@ au1000_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) ...@@ -656,7 +654,6 @@ au1000_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
struct au1000_private *aup = netdev_priv(dev); struct au1000_private *aup = netdev_priv(dev);
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), "%s %d", DRV_NAME, snprintf(info->bus_info, sizeof(info->bus_info), "%s %d", DRV_NAME,
aup->mac_id); aup->mac_id);
} }
...@@ -1290,8 +1287,6 @@ static int au1000_probe(struct platform_device *pdev) ...@@ -1290,8 +1287,6 @@ static int au1000_probe(struct platform_device *pdev)
netdev_info(dev, "Au1xx0 Ethernet found at 0x%lx, irq %d\n", netdev_info(dev, "Au1xx0 Ethernet found at 0x%lx, irq %d\n",
(unsigned long)base->start, irq); (unsigned long)base->start, irq);
pr_info_once("%s version %s %s\n", DRV_NAME, DRV_VERSION, DRV_AUTHOR);
return 0; return 0;
err_out: err_out:
......
...@@ -114,8 +114,6 @@ Log: nmclan_cs.c,v ...@@ -114,8 +114,6 @@ Log: nmclan_cs.c,v
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#define DRV_NAME "nmclan_cs" #define DRV_NAME "nmclan_cs"
#define DRV_VERSION "0.16"
/* ---------------------------------------------------------------------------- /* ----------------------------------------------------------------------------
Conditional Compilation Options Conditional Compilation Options
...@@ -367,7 +365,7 @@ typedef struct _mace_private { ...@@ -367,7 +365,7 @@ typedef struct _mace_private {
char tx_free_frames; /* Number of free transmit frame buffers */ char tx_free_frames; /* Number of free transmit frame buffers */
char tx_irq_disabled; /* MACE TX interrupt disabled */ char tx_irq_disabled; /* MACE TX interrupt disabled */
spinlock_t bank_lock; /* Must be held if you step off bank 0 */ spinlock_t bank_lock; /* Must be held if you step off bank 0 */
} mace_private; } mace_private;
...@@ -444,7 +442,7 @@ static int nmclan_probe(struct pcmcia_device *link) ...@@ -444,7 +442,7 @@ static int nmclan_probe(struct pcmcia_device *link)
lp = netdev_priv(dev); lp = netdev_priv(dev);
lp->p_dev = link; lp->p_dev = link;
link->priv = dev; link->priv = dev;
spin_lock_init(&lp->bank_lock); spin_lock_init(&lp->bank_lock);
link->resource[0]->end = 32; link->resource[0]->end = 32;
link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO; link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
...@@ -817,7 +815,6 @@ static void netdev_get_drvinfo(struct net_device *dev, ...@@ -817,7 +815,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);
} }
...@@ -1110,7 +1107,7 @@ static int mace_rx(struct net_device *dev, unsigned char RxCnt) ...@@ -1110,7 +1107,7 @@ static int mace_rx(struct net_device *dev, unsigned char RxCnt)
if (pkt_len & 1) if (pkt_len & 1)
*(skb_tail_pointer(skb) - 1) = inb(ioaddr + AM2150_RCV); *(skb_tail_pointer(skb) - 1) = inb(ioaddr + AM2150_RCV);
skb->protocol = eth_type_trans(skb, dev); skb->protocol = eth_type_trans(skb, dev);
netif_rx(skb); /* Send the packet to the upper (protocol) layers. */ netif_rx(skb); /* Send the packet to the upper (protocol) layers. */
dev->stats.rx_packets++; dev->stats.rx_packets++;
......
...@@ -24,13 +24,9 @@ ...@@ -24,13 +24,9 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#define DRV_NAME "pcnet32" #define DRV_NAME "pcnet32"
#define DRV_VERSION "1.35"
#define DRV_RELDATE "21.Apr.2008" #define DRV_RELDATE "21.Apr.2008"
#define PFX DRV_NAME ": " #define PFX DRV_NAME ": "
static const char *const version =
DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " tsbogend@alpha.franken.de\n";
#include <linux/module.h> #include <linux/module.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/sched.h> #include <linux/sched.h>
...@@ -809,7 +805,6 @@ static void pcnet32_get_drvinfo(struct net_device *dev, ...@@ -809,7 +805,6 @@ static void pcnet32_get_drvinfo(struct net_device *dev,
struct pcnet32_private *lp = netdev_priv(dev); struct pcnet32_private *lp = netdev_priv(dev);
strlcpy(info->driver, DRV_NAME, sizeof(info->driver)); strlcpy(info->driver, DRV_NAME, sizeof(info->driver));
strlcpy(info->version, DRV_VERSION, sizeof(info->version));
if (lp->pci_dev) if (lp->pci_dev)
strlcpy(info->bus_info, pci_name(lp->pci_dev), strlcpy(info->bus_info, pci_name(lp->pci_dev),
sizeof(info->bus_info)); sizeof(info->bus_info));
...@@ -3006,8 +3001,6 @@ MODULE_LICENSE("GPL"); ...@@ -3006,8 +3001,6 @@ MODULE_LICENSE("GPL");
static int __init pcnet32_init_module(void) static int __init pcnet32_init_module(void)
{ {
pr_info("%s", version);
pcnet32_debug = netif_msg_init(debug, PCNET32_MSG_DEFAULT); pcnet32_debug = netif_msg_init(debug, PCNET32_MSG_DEFAULT);
if ((tx_start_pt >= 0) && (tx_start_pt <= 3)) if ((tx_start_pt >= 0) && (tx_start_pt <= 3))
......
...@@ -105,14 +105,9 @@ static char lancestr[] = "LANCE"; ...@@ -105,14 +105,9 @@ static char lancestr[] = "LANCE";
#include <asm/irq.h> #include <asm/irq.h>
#define DRV_NAME "sunlance" #define DRV_NAME "sunlance"
#define DRV_VERSION "2.02"
#define DRV_RELDATE "8/24/03" #define DRV_RELDATE "8/24/03"
#define DRV_AUTHOR "Miguel de Icaza (miguel@nuclecu.unam.mx)" #define DRV_AUTHOR "Miguel de Icaza (miguel@nuclecu.unam.mx)"
static char version[] =
DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " " DRV_AUTHOR "\n";
MODULE_VERSION(DRV_VERSION);
MODULE_AUTHOR(DRV_AUTHOR); MODULE_AUTHOR(DRV_AUTHOR);
MODULE_DESCRIPTION("Sun Lance ethernet driver"); MODULE_DESCRIPTION("Sun Lance ethernet driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
...@@ -1282,7 +1277,6 @@ static void lance_free_hwresources(struct lance_private *lp) ...@@ -1282,7 +1277,6 @@ static void lance_free_hwresources(struct lance_private *lp)
static void sparc_lance_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) static void sparc_lance_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
{ {
strlcpy(info->driver, "sunlance", sizeof(info->driver)); strlcpy(info->driver, "sunlance", sizeof(info->driver));
strlcpy(info->version, "2.02", sizeof(info->version));
} }
static const struct ethtool_ops sparc_lance_ethtool_ops = { static const struct ethtool_ops sparc_lance_ethtool_ops = {
...@@ -1305,7 +1299,6 @@ static int sparc_lance_probe_one(struct platform_device *op, ...@@ -1305,7 +1299,6 @@ static int sparc_lance_probe_one(struct platform_device *op,
struct platform_device *lebuffer) struct platform_device *lebuffer)
{ {
struct device_node *dp = op->dev.of_node; struct device_node *dp = op->dev.of_node;
static unsigned version_printed;
struct lance_private *lp; struct lance_private *lp;
struct net_device *dev; struct net_device *dev;
int i; int i;
...@@ -1316,9 +1309,6 @@ static int sparc_lance_probe_one(struct platform_device *op, ...@@ -1316,9 +1309,6 @@ static int sparc_lance_probe_one(struct platform_device *op,
lp = netdev_priv(dev); lp = netdev_priv(dev);
if (sparc_lance_debug && version_printed++ == 0)
printk (KERN_INFO "%s", version);
spin_lock_init(&lp->lock); spin_lock_init(&lp->lock);
/* Copy the IDPROM ethernet address to the device structure, later we /* Copy the IDPROM ethernet address to the device structure, later we
......
...@@ -405,7 +405,6 @@ static void xgbe_get_drvinfo(struct net_device *netdev, ...@@ -405,7 +405,6 @@ static void xgbe_get_drvinfo(struct net_device *netdev,
struct xgbe_hw_features *hw_feat = &pdata->hw_feat; struct xgbe_hw_features *hw_feat = &pdata->hw_feat;
strlcpy(drvinfo->driver, XGBE_DRV_NAME, sizeof(drvinfo->driver)); strlcpy(drvinfo->driver, XGBE_DRV_NAME, sizeof(drvinfo->driver));
strlcpy(drvinfo->version, XGBE_DRV_VERSION, sizeof(drvinfo->version));
strlcpy(drvinfo->bus_info, dev_name(pdata->dev), strlcpy(drvinfo->bus_info, dev_name(pdata->dev),
sizeof(drvinfo->bus_info)); sizeof(drvinfo->bus_info));
snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version), "%d.%d.%d", snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version), "%d.%d.%d",
......
...@@ -127,7 +127,6 @@ ...@@ -127,7 +127,6 @@
MODULE_AUTHOR("Tom Lendacky <thomas.lendacky@amd.com>"); MODULE_AUTHOR("Tom Lendacky <thomas.lendacky@amd.com>");
MODULE_LICENSE("Dual BSD/GPL"); MODULE_LICENSE("Dual BSD/GPL");
MODULE_VERSION(XGBE_DRV_VERSION);
MODULE_DESCRIPTION(XGBE_DRV_DESC); MODULE_DESCRIPTION(XGBE_DRV_DESC);
static int debug = -1; static int debug = -1;
......
...@@ -135,7 +135,6 @@ ...@@ -135,7 +135,6 @@
#include <linux/list.h> #include <linux/list.h>
#define XGBE_DRV_NAME "amd-xgbe" #define XGBE_DRV_NAME "amd-xgbe"
#define XGBE_DRV_VERSION "1.0.3"
#define XGBE_DRV_DESC "AMD 10 Gigabit Ethernet Driver" #define XGBE_DRV_DESC "AMD 10 Gigabit Ethernet Driver"
/* Descriptor related defines */ /* Descriptor related defines */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment