From: Malcolm Priestley Date: Thu, 21 Aug 2014 20:40:49 +0000 (+0100) Subject: staging: vt6655: remove multiple instances of netdevice. X-Git-Tag: v3.18-rc1~130^2~960 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=33cfce64e73524225df2a7f90b74efafd1a4178a;p=karo-tx-linux.git staging: vt6655: remove multiple instances of netdevice. netdevice can only be created once. Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h index bc16ece45eb2..8ac790124eef 100644 --- a/drivers/staging/vt6655/device.h +++ b/drivers/staging/vt6655/device.h @@ -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 diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index a441a5c800eb..ffbe64fce16c 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -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);