diff options
| author | Malcolm Priestley <tvboxspy@gmail.com> | 2014-08-21 21:40:50 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-08-30 13:49:34 -0700 |
| commit | 43e79c0fb3cafef9bb5c9f048aad4ff2249c9741 (patch) | |
| tree | fe7462674647a4b1936021d87ffea232580d2756 | |
| parent | 33cfce64e73524225df2a7f90b74efafd1a4178a (diff) | |
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>
| -rw-r--r-- | drivers/staging/vt6655/device_cfg.h | 3 | ||||
| -rw-r--r-- | drivers/staging/vt6655/device_main.c | 12 |
2 files changed, 2 insertions, 13 deletions
diff --git a/drivers/staging/vt6655/device_cfg.h b/drivers/staging/vt6655/device_cfg.h index 8e50e538076f..7221824e4f23 100644 --- 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 ffbe64fce16c..34a70b04a109 100644 --- 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; |