net/adaptec: Clean driver versions (1434ae95) · Commits · 戴 / test

drivers/net/ethernet/adaptec/starfire.c

+1 −18

Original line number	Diff line number	Diff line
		@@ -27,8 +27,6 @@
		*/

		#define DRV_NAME "starfire"
		#define DRV_VERSION "2.1"
		#define DRV_RELDATE "July 6, 2008"

		#include <linux/interrupt.h>
		#include <linux/module.h>
		@@ -47,6 +45,7 @@
		#include <asm/processor.h> /* Processor type for cache alignment. */
		#include <linux/uaccess.h>
		#include <asm/io.h>
		#include <linux/vermagic.h>

		/*
		* The current frame processor firmware fails to checksum a fragment
		@@ -165,15 +164,9 @@ static int rx_copybreak /* = 0 */;
		#define FIRMWARE_RX "adaptec/starfire_rx.bin"
		#define FIRMWARE_TX "adaptec/starfire_tx.bin"

		/* These identify the driver base version and may not be removed. */
		static const char version[] =
		KERN_INFO "starfire.c:v1.03 7/26/2000 Written by Donald Becker <becker@scyld.com>\n"
		" (unofficial 2.2/2.4 kernel port, version " DRV_VERSION ", " DRV_RELDATE ")\n";

		MODULE_AUTHOR("Donald Becker <becker@scyld.com>");
		MODULE_DESCRIPTION("Adaptec Starfire Ethernet driver");
		MODULE_LICENSE("GPL");
		MODULE_VERSION(DRV_VERSION);
		MODULE_FIRMWARE(FIRMWARE_RX);
		MODULE_FIRMWARE(FIRMWARE_TX);

		@@ -654,13 +647,6 @@ static int starfire_init_one(struct pci_dev *pdev,
		int drv_flags, io_size;
		int boguscnt;

		/* when built into the kernel, we only print version if device is found */
		#ifndef MODULE
		static int printed_version;
		if (!printed_version++)
		printk(version);
		#endif

		if (pci_enable_device (pdev))
		return -EIO;

		@@ -1853,7 +1839,6 @@ static void get_drvinfo(struct net_device dev, struct ethtool_drvinfo info)
		{
		struct netdev_private *np = netdev_priv(dev);
		strlcpy(info->driver, DRV_NAME, sizeof(info->driver));
		strlcpy(info->version, DRV_VERSION, sizeof(info->version));
		strlcpy(info->bus_info, pci_name(np->pci_dev), sizeof(info->bus_info));
		}

		@@ -2073,8 +2058,6 @@ static int __init starfire_init (void)
		{
		/* when a module, this is printed whether or not devices are found in probe */
		#ifdef MODULE
		printk(version);

		printk(KERN_INFO DRV_NAME ": polling (NAPI) enabled\n");
		#endif

Admin message