Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net/amd: Remove useless driver version

Convert AMD drivers to respect universal linux kernel version.

Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Leon Romanovsky and committed by
David S. Miller
7f4d2537 1a63443a

+4 -35
+1 -4
drivers/net/ethernet/amd/amd8111e.c
··· 84 84 85 85 #include "amd8111e.h" 86 86 #define MODULE_NAME "amd8111e" 87 - #define MODULE_VERS "3.0.7" 88 87 MODULE_AUTHOR("Advanced Micro Devices, Inc."); 89 - MODULE_DESCRIPTION ("AMD8111 based 10/100 Ethernet Controller. Driver Version "MODULE_VERS); 88 + MODULE_DESCRIPTION("AMD8111 based 10/100 Ethernet Controller."); 90 89 MODULE_LICENSE("GPL"); 91 90 module_param_array(speed_duplex, int, NULL, 0); 92 91 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"); ··· 1365 1366 struct amd8111e_priv *lp = netdev_priv(dev); 1366 1367 struct pci_dev *pci_dev = lp->pci_dev; 1367 1368 strlcpy(info->driver, MODULE_NAME, sizeof(info->driver)); 1368 - strlcpy(info->version, MODULE_VERS, sizeof(info->version)); 1369 1369 snprintf(info->fw_version, sizeof(info->fw_version), 1370 1370 "%u", chip_version); 1371 1371 strlcpy(info->bus_info, pci_name(pci_dev), sizeof(info->bus_info)); ··· 1873 1875 1874 1876 /* display driver and device information */ 1875 1877 chip_version = (readl(lp->mmio + CHIPID) & 0xf0000000)>>28; 1876 - dev_info(&pdev->dev, "AMD-8111e Driver Version: %s\n", MODULE_VERS); 1877 1878 dev_info(&pdev->dev, "[ Rev %x ] PCI 10/100BaseT Ethernet %pM\n", 1878 1879 chip_version, dev->dev_addr); 1879 1880 if (lp->ext_phy_id)
-5
drivers/net/ethernet/amd/au1000_eth.c
··· 63 63 NETIF_MSG_LINK) 64 64 65 65 #define DRV_NAME "au1000_eth" 66 - #define DRV_VERSION "1.7" 67 66 #define DRV_AUTHOR "Pete Popov <ppopov@embeddedalley.com>" 68 67 #define DRV_DESC "Au1xxx on-chip Ethernet driver" 69 68 70 69 MODULE_AUTHOR(DRV_AUTHOR); 71 70 MODULE_DESCRIPTION(DRV_DESC); 72 71 MODULE_LICENSE("GPL"); 73 - MODULE_VERSION(DRV_VERSION); 74 72 75 73 /* AU1000 MAC registers and bits */ 76 74 #define MAC_CONTROL 0x0 ··· 654 656 struct au1000_private *aup = netdev_priv(dev); 655 657 656 658 strlcpy(info->driver, DRV_NAME, sizeof(info->driver)); 657 - strlcpy(info->version, DRV_VERSION, sizeof(info->version)); 658 659 snprintf(info->bus_info, sizeof(info->bus_info), "%s %d", DRV_NAME, 659 660 aup->mac_id); 660 661 } ··· 1286 1289 1287 1290 netdev_info(dev, "Au1xx0 Ethernet found at 0x%lx, irq %d\n", 1288 1291 (unsigned long)base->start, irq); 1289 - 1290 - pr_info_once("%s version %s %s\n", DRV_NAME, DRV_VERSION, DRV_AUTHOR); 1291 1292 1292 1293 return 0; 1293 1294
+3 -6
drivers/net/ethernet/amd/nmclan_cs.c
··· 114 114 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt 115 115 116 116 #define DRV_NAME "nmclan_cs" 117 - #define DRV_VERSION "0.16" 118 - 119 117 120 118 /* ---------------------------------------------------------------------------- 121 119 Conditional Compilation Options ··· 365 367 366 368 char tx_free_frames; /* Number of free transmit frame buffers */ 367 369 char tx_irq_disabled; /* MACE TX interrupt disabled */ 368 - 370 + 369 371 spinlock_t bank_lock; /* Must be held if you step off bank 0 */ 370 372 } mace_private; 371 373 ··· 442 444 lp = netdev_priv(dev); 443 445 lp->p_dev = link; 444 446 link->priv = dev; 445 - 447 + 446 448 spin_lock_init(&lp->bank_lock); 447 449 link->resource[0]->end = 32; 448 450 link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO; ··· 815 817 struct ethtool_drvinfo *info) 816 818 { 817 819 strlcpy(info->driver, DRV_NAME, sizeof(info->driver)); 818 - strlcpy(info->version, DRV_VERSION, sizeof(info->version)); 819 820 snprintf(info->bus_info, sizeof(info->bus_info), 820 821 "PCMCIA 0x%lx", dev->base_addr); 821 822 } ··· 1107 1110 if (pkt_len & 1) 1108 1111 *(skb_tail_pointer(skb) - 1) = inb(ioaddr + AM2150_RCV); 1109 1112 skb->protocol = eth_type_trans(skb, dev); 1110 - 1113 + 1111 1114 netif_rx(skb); /* Send the packet to the upper (protocol) layers. */ 1112 1115 1113 1116 dev->stats.rx_packets++;
-7
drivers/net/ethernet/amd/pcnet32.c
··· 24 24 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt 25 25 26 26 #define DRV_NAME "pcnet32" 27 - #define DRV_VERSION "1.35" 28 27 #define DRV_RELDATE "21.Apr.2008" 29 28 #define PFX DRV_NAME ": " 30 - 31 - static const char *const version = 32 - DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " tsbogend@alpha.franken.de\n"; 33 29 34 30 #include <linux/module.h> 35 31 #include <linux/kernel.h> ··· 805 809 struct pcnet32_private *lp = netdev_priv(dev); 806 810 807 811 strlcpy(info->driver, DRV_NAME, sizeof(info->driver)); 808 - strlcpy(info->version, DRV_VERSION, sizeof(info->version)); 809 812 if (lp->pci_dev) 810 813 strlcpy(info->bus_info, pci_name(lp->pci_dev), 811 814 sizeof(info->bus_info)); ··· 3001 3006 3002 3007 static int __init pcnet32_init_module(void) 3003 3008 { 3004 - pr_info("%s", version); 3005 - 3006 3009 pcnet32_debug = netif_msg_init(debug, PCNET32_MSG_DEFAULT); 3007 3010 3008 3011 if ((tx_start_pt >= 0) && (tx_start_pt <= 3))
-10
drivers/net/ethernet/amd/sunlance.c
··· 105 105 #include <asm/irq.h> 106 106 107 107 #define DRV_NAME "sunlance" 108 - #define DRV_VERSION "2.02" 109 108 #define DRV_RELDATE "8/24/03" 110 109 #define DRV_AUTHOR "Miguel de Icaza (miguel@nuclecu.unam.mx)" 111 110 112 - static char version[] = 113 - DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " " DRV_AUTHOR "\n"; 114 - 115 - MODULE_VERSION(DRV_VERSION); 116 111 MODULE_AUTHOR(DRV_AUTHOR); 117 112 MODULE_DESCRIPTION("Sun Lance ethernet driver"); 118 113 MODULE_LICENSE("GPL"); ··· 1277 1282 static void sparc_lance_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) 1278 1283 { 1279 1284 strlcpy(info->driver, "sunlance", sizeof(info->driver)); 1280 - strlcpy(info->version, "2.02", sizeof(info->version)); 1281 1285 } 1282 1286 1283 1287 static const struct ethtool_ops sparc_lance_ethtool_ops = { ··· 1299 1305 struct platform_device *lebuffer) 1300 1306 { 1301 1307 struct device_node *dp = op->dev.of_node; 1302 - static unsigned version_printed; 1303 1308 struct lance_private *lp; 1304 1309 struct net_device *dev; 1305 1310 int i; ··· 1308 1315 return -ENOMEM; 1309 1316 1310 1317 lp = netdev_priv(dev); 1311 - 1312 - if (sparc_lance_debug && version_printed++ == 0) 1313 - printk (KERN_INFO "%s", version); 1314 1318 1315 1319 spin_lock_init(&lp->lock); 1316 1320
-1
drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
··· 405 405 struct xgbe_hw_features *hw_feat = &pdata->hw_feat; 406 406 407 407 strlcpy(drvinfo->driver, XGBE_DRV_NAME, sizeof(drvinfo->driver)); 408 - strlcpy(drvinfo->version, XGBE_DRV_VERSION, sizeof(drvinfo->version)); 409 408 strlcpy(drvinfo->bus_info, dev_name(pdata->dev), 410 409 sizeof(drvinfo->bus_info)); 411 410 snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version), "%d.%d.%d",
-1
drivers/net/ethernet/amd/xgbe/xgbe-main.c
··· 127 127 128 128 MODULE_AUTHOR("Tom Lendacky <thomas.lendacky@amd.com>"); 129 129 MODULE_LICENSE("Dual BSD/GPL"); 130 - MODULE_VERSION(XGBE_DRV_VERSION); 131 130 MODULE_DESCRIPTION(XGBE_DRV_DESC); 132 131 133 132 static int debug = -1;
-1
drivers/net/ethernet/amd/xgbe/xgbe.h
··· 135 135 #include <linux/list.h> 136 136 137 137 #define XGBE_DRV_NAME "amd-xgbe" 138 - #define XGBE_DRV_VERSION "1.0.3" 139 138 #define XGBE_DRV_DESC "AMD 10 Gigabit Ethernet Driver" 140 139 141 140 /* Descriptor related defines */