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

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

drivers/net/ethernet/amd/amd8111e.c

+1 −4
Original line number Diff line number Diff line
@@ -84,9 +84,8 @@ Revision History: 


#include "amd8111e.h"

#define MODULE_NAME	"amd8111e"

#define MODULE_VERS	"3.0.7"

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_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");
@@ -1366,7 +1365,6 @@ static void amd8111e_get_drvinfo(struct net_device *dev, 
	struct amd8111e_priv *lp = netdev_priv(dev);

	struct pci_dev *pci_dev = lp->pci_dev;

	strlcpy(info->driver, MODULE_NAME, sizeof(info->driver));

	strlcpy(info->version, MODULE_VERS, sizeof(info->version));

	snprintf(info->fw_version, sizeof(info->fw_version),

		"%u", chip_version);

	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, 


	/*  display driver and device information */

    	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",

		 chip_version, dev->dev_addr);

	if (lp->ext_phy_id)

drivers/net/ethernet/amd/au1000_eth.c

+0 −5
Original line number Diff line number Diff line
@@ -63,14 +63,12 @@ static int au1000_debug = 3; 
				NETIF_MSG_LINK)



#define DRV_NAME	"au1000_eth"

#define DRV_VERSION	"1.7"

#define DRV_AUTHOR	"Pete Popov <ppopov@embeddedalley.com>"

#define DRV_DESC	"Au1xxx on-chip Ethernet driver"



MODULE_AUTHOR(DRV_AUTHOR);

MODULE_DESCRIPTION(DRV_DESC);

MODULE_LICENSE("GPL");

MODULE_VERSION(DRV_VERSION);



/* AU1000 MAC registers and bits */

#define MAC_CONTROL		0x0
@@ -656,7 +654,6 @@ au1000_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) 
	struct au1000_private *aup = netdev_priv(dev);



	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,

		 aup->mac_id);

}
@@ -1290,8 +1287,6 @@ static int au1000_probe(struct platform_device *pdev) 
	netdev_info(dev, "Au1xx0 Ethernet found at 0x%lx, irq %d\n",

			(unsigned long)base->start, irq);



	pr_info_once("%s version %s %s\n", DRV_NAME, DRV_VERSION, DRV_AUTHOR);



	return 0;



err_out:

drivers/net/ethernet/amd/nmclan_cs.c

+3 −6
Original line number Diff line number Diff line
@@ -114,8 +114,6 @@ Log: nmclan_cs.c,v 
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#define DRV_NAME	"nmclan_cs"

#define DRV_VERSION	"0.16"





/* ----------------------------------------------------------------------------

Conditional Compilation Options
@@ -817,7 +815,6 @@ static void netdev_get_drvinfo(struct net_device *dev, 
			       struct ethtool_drvinfo *info)

{

	strlcpy(info->driver, DRV_NAME, sizeof(info->driver));

	strlcpy(info->version, DRV_VERSION, sizeof(info->version));

	snprintf(info->bus_info, sizeof(info->bus_info),

		"PCMCIA 0x%lx", dev->base_addr);

}

drivers/net/ethernet/amd/pcnet32.c

+0 −7
Original line number Diff line number Diff line
@@ -24,13 +24,9 @@ 
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#define DRV_NAME	"pcnet32"

#define DRV_VERSION	"1.35"

#define DRV_RELDATE	"21.Apr.2008"

#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/kernel.h>

#include <linux/sched.h>
@@ -809,7 +805,6 @@ static void pcnet32_get_drvinfo(struct net_device *dev, 
	struct pcnet32_private *lp = netdev_priv(dev);



	strlcpy(info->driver, DRV_NAME, sizeof(info->driver));

	strlcpy(info->version, DRV_VERSION, sizeof(info->version));

	if (lp->pci_dev)

		strlcpy(info->bus_info, pci_name(lp->pci_dev),

			sizeof(info->bus_info));
@@ -3006,8 +3001,6 @@ MODULE_LICENSE("GPL"); 


static int __init pcnet32_init_module(void)

{

	pr_info("%s", version);



	pcnet32_debug = netif_msg_init(debug, PCNET32_MSG_DEFAULT);



	if ((tx_start_pt >= 0) && (tx_start_pt <= 3))

drivers/net/ethernet/amd/sunlance.c

+0 −10
Original line number Diff line number Diff line
@@ -105,14 +105,9 @@ static char lancestr[] = "LANCE"; 
#include <asm/irq.h>



#define DRV_NAME	"sunlance"

#define DRV_VERSION	"2.02"

#define DRV_RELDATE	"8/24/03"

#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_DESCRIPTION("Sun Lance ethernet driver");

MODULE_LICENSE("GPL");
@@ -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)

{

	strlcpy(info->driver, "sunlance", sizeof(info->driver));

	strlcpy(info->version, "2.02", sizeof(info->version));

}



static const struct ethtool_ops sparc_lance_ethtool_ops = {
@@ -1305,7 +1299,6 @@ static int sparc_lance_probe_one(struct platform_device *op, 
				 struct platform_device *lebuffer)

{

	struct device_node *dp = op->dev.of_node;

	static unsigned version_printed;

	struct lance_private *lp;

	struct net_device *dev;

	int    i;
@@ -1316,9 +1309,6 @@ static int sparc_lance_probe_one(struct platform_device *op, 


	lp = netdev_priv(dev);



	if (sparc_lance_debug && version_printed++ == 0)

		printk (KERN_INFO "%s", version);



	spin_lock_init(&lp->lock);



	/* Copy the IDPROM ethernet address to the device structure, later we

CRA Git | Maintained and supported by SUSTech CRA and CCSE