staging: vt6655: dead code remove device_nics variable

The module can not load more than once.

Remove device_nics, MAX_UINTS and OPTION_DEFAULT

Remove dead index variable from device_get_options

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vt6655/device_cfg.h b/drivers/staging/vt6655/device_cfg.h
index 8e50e538076f67843ae4dbae5934a7b5416db192..7221824e4f23f10f08cdcb0d2275f62d107c1dc5 100644 (file)
--- a/drivers/staging/vt6655/device_cfg.h
+++ b/drivers/staging/vt6655/device_cfg.h
@@ -67,9 +67,6 @@ struct _version {
 
 #define PKT_BUF_SZ          2390
 
-#define MAX_UINTS           8
-#define OPTION_DEFAULT      { [0 ... MAX_UINTS-1] = -1}
-
 typedef enum  _chip_type {
        VT3253 = 1
 } CHIP_TYPE, *PCHIP_TYPE;

diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index ffbe64fce16c01e45075eeb6ad53fd82487e668e..34a70b04a1098b6d8653b6402b9ce07192c203a5 100644 (file)
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -245,9 +245,6 @@ DEVICE_PARAM(bDiversityANTEnable, "ANT diversity mode");
 //
 // Static vars definitions
 //
-
-static int          device_nics             = 0;
-
 static CHIP_INFO chip_info_table[] = {
        { VT3253,       "VIA Networking Solomon-A/B/G Wireless LAN Adapter ",
          256, 1,     DEVICE_FLAGS_IP_ALIGN|DEVICE_FLAGS_TX_ALIGN },
@@ -336,7 +333,7 @@ static void vt6655_remove(struct pci_dev *pcid)
 }
 
 static void device_get_options(struct vnt_private *pDevice,
-                              int index, char *devname)
+                              char *devname)
 {
        POPTIONS pOpts = &(pDevice->sOpts);
 
@@ -825,11 +822,6 @@ vt6655_probe(struct pci_dev *pcid, const struct pci_device_id *ent)
        struct vnt_private *pDevice;
        int         rc;
 
-       if (device_nics++ >= MAX_UINTS) {
-               pr_notice(DEVICE_NAME ": already found %d NICs\n", device_nics);
-               return -ENODEV;
-       }
-
        dev = alloc_etherdev(sizeof(*pDevice));
 
        pDevice = netdev_priv(dev);
@@ -934,7 +926,7 @@ vt6655_probe(struct pci_dev *pcid, const struct pci_device_id *ent)
        MACvInitialize(pDevice->PortOffset);
        MACvReadEtherAddress(pDevice->PortOffset, dev->dev_addr);
 
-       device_get_options(pDevice, device_nics-1, dev->name);
+       device_get_options(pDevice, dev->name);
        device_set_options(pDevice);
        //Mask out the options cannot be set to the chip
        pDevice->sOpts.flags &= pChip_info->flags;