Skip to contentSkip to conversation

staging: et131x: Remove file et131x_version.h

PATCH New Mark Einon 1 participant 1 message Oct 7, 2011 Staging

lore
Share & tools
lore

Mark Einon

author
#0 lore raw

PATCH 4/4 staging: et131x: Remove file et131x_version.h

Removed defines in et131x_version.h and replaced them by actual strings where convinient, or moved them to et131x.h

Signed-off-by Mark Einon <[email protected]>
---
 drivers/staging/et131x/et1310_eeprom.c  |    1 -
 drivers/staging/et131x/et1310_mac.c     |    1 -
 drivers/staging/et131x/et1310_phy.c     |    1 -
 drivers/staging/et131x/et1310_pm.c      |    1 -
 drivers/staging/et131x/et1310_rx.c      |    1 -
 drivers/staging/et131x/et1310_tx.c      |    1 -
 drivers/staging/et131x/et131x.h         |    3 +
 drivers/staging/et131x/et131x_ethtool.c |    4 +-
 drivers/staging/et131x/et131x_initpci.c |   11 ++---
 drivers/staging/et131x/et131x_isr.c     |    1 -
 drivers/staging/et131x/et131x_netdev.c  |    1 -
 drivers/staging/et131x/et131x_version.h |   75 -------------------------------
 12 files changed, 10 insertions(+), 91 deletions(-)
 delete mode 100644 drivers/staging/et131x/et131x_version.h
drivers/staging/et131x/et1310_eeprom.c +0 -1
index 747b1dc..20b9660 100644
@@ -57,7 +57,6 @@
  *
  */
 
-#include "et131x_version.h"
 #include "et131x_defs.h"
 
 #include <linux/pci.h>
drivers/staging/et131x/et1310_mac.c +0 -1
index b4c9df1..017ece7 100644
@@ -57,7 +57,6 @@
  *
  */
 
-#include "et131x_version.h"
 #include "et131x_defs.h"
 
 #include <linux/init.h>
drivers/staging/et131x/et1310_phy.c +0 -1
index 145ec76..b809dd4 100644
@@ -57,7 +57,6 @@
  *
  */
 
-#include "et131x_version.h"
 #include "et131x_defs.h"
 
 #include <linux/pci.h>
drivers/staging/et131x/et1310_pm.c +0 -1
index a1b72bf..91d47dc 100644
@@ -57,7 +57,6 @@
  *
  */
 
-#include "et131x_version.h"
 #include "et131x_defs.h"
 
 #include <linux/init.h>
drivers/staging/et131x/et1310_rx.c +0 -1
index 600a8f1..814922b 100644
@@ -57,7 +57,6 @@
  *
  */
 
-#include "et131x_version.h"
 #include "et131x_defs.h"
 
 #include <linux/pci.h>
drivers/staging/et131x/et1310_tx.c +0 -1
index 2ecb934..cd12500 100644
@@ -57,7 +57,6 @@
  *
  */
 
-#include "et131x_version.h"
 #include "et131x_defs.h"
 
 #include <linux/pci.h>
drivers/staging/et131x/et131x.h +3 -0
index e832234..24570ca 100644
@@ -48,6 +48,9 @@
  *
  */
 
+#define DRIVER_NAME "et131x"
+#define DRIVER_VERSION "v2.0"
+
 /* et131x_eeprom.c */
 int et131x_init_eeprom(struct et131x_adapter *adapter);
drivers/staging/et131x/et131x_ethtool.c +2 -2
index 903b5a0..ff95a3e 100644
@@ -15,7 +15,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#include "et131x_version.h"
+
 #include "et131x_defs.h"
 
 #include <linux/types.h>

@@ -181,7 +181,7 @@ static void et131x_get_drvinfo(struct net_device *netdev,
 	struct et131x_adapter *adapter = netdev_priv(netdev);
 
 	strncpy(info->driver, DRIVER_NAME, ET131X_DRVINFO_LEN);
-	strncpy(info->version, DRIVER_VERSION_STRING, ET131X_DRVINFO_LEN);
+	strncpy(info->version, DRIVER_VERSION, ET131X_DRVINFO_LEN);
 	strncpy(info->bus_info, pci_name(adapter->pdev), ET131X_DRVINFO_LEN);
 }
drivers/staging/et131x/et131x_initpci.c +5 -6
index 2f03ba0..33e50e9 100644
@@ -59,7 +59,6 @@
  *
  */
 
-#include "et131x_version.h"
 #include "et131x_defs.h"
 
 #include <linux/pci.h>

@@ -944,8 +943,8 @@ static void __exit et131x_cleanup_module(void)
 module_init(et131x_init_module);
 module_exit(et131x_cleanup_module);
 
-/* Modinfo parameters (filled out using defines from et131x_version.h) */
-MODULE_AUTHOR(DRIVER_AUTHOR);
-MODULE_AUTHOR(DRIVER_AUTHOR2);
-MODULE_DESCRIPTION(DRIVER_INFO);
-MODULE_LICENSE(DRIVER_LICENSE);
+MODULE_AUTHOR("Victor Soriano <[email protected]>");
+MODULE_AUTHOR("Mark Einon <[email protected]>");
+MODULE_LICENSE("Dual BSD/GPL");
+MODULE_DESCRIPTION("10/100/1000 Base-T Ethernet Driver "
+		   "for the ET1310 by Agere Systems");
drivers/staging/et131x/et131x_isr.c +0 -1
index bccd0e5..cf8665b 100644
@@ -58,7 +58,6 @@
  *
  */
 
-#include "et131x_version.h"
 #include "et131x_defs.h"
 
 #include <linux/init.h>
drivers/staging/et131x/et131x_netdev.c +0 -1
index 16373bb..bcb4756 100644
@@ -57,7 +57,6 @@
  *
  */
 
-#include "et131x_version.h"
 #include "et131x_defs.h"
 
 #include <linux/init.h>
drivers/staging/et131x/et131x_version.h deleted +0 -75

75 lines not on this page · raw message

Signature · 1 line
1.7.6.4