staging: vt6655: remove multiple instances of netdevice.
authorMalcolm Priestley <tvboxspy@gmail.com>
Thu, 21 Aug 2014 20:40:49 +0000 (21:40 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 30 Aug 2014 20:49:34 +0000 (13:49 -0700)
netdevice can only be created once.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6655/device.h
drivers/staging/vt6655/device_main.c

index bc16ece45eb2e804ad07ab5671fb9eec0dbf4549..8ac790124eef81515fb1a7d230574740153c379a 100644 (file)
@@ -339,7 +339,6 @@ struct vnt_private {
 
 // netdev
        struct net_device *dev;
-       struct net_device *next_module;
        struct net_device_stats     stats;
 
 //dma addr, rx/tx pool
index a441a5c800eb879398c54c2f9f4cd18a0664f319..ffbe64fce16c01e45075eeb6ad53fd82487e668e 100644 (file)
@@ -247,7 +247,6 @@ DEVICE_PARAM(bDiversityANTEnable, "ANT diversity mode");
 //
 
 static int          device_nics             = 0;
-static struct net_device *root_device_dev = NULL;
 
 static CHIP_INFO chip_info_table[] = {
        { VT3253,       "VIA Networking Solomon-A/B/G Wireless LAN Adapter ",
@@ -851,8 +850,6 @@ vt6655_probe(struct pci_dev *pcid, const struct pci_device_id *ent)
 
        vt6655_init_info(pcid, &pDevice, pChip_info);
        pDevice->dev = dev;
-       pDevice->next_module = root_device_dev;
-       root_device_dev = dev;
 
        if (pci_enable_device(pcid)) {
                device_free_info(pDevice);