diff options
author | Stephen Hemminger <stephen@networkplumber.org> | 2013-01-15 02:28:32 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-01-16 14:40:51 -0500 |
commit | f32a2605bbf9a42884b11e222d208ae0372f6d89 (patch) | |
tree | 731496f3dd508e932150fdf0a44835c004196e23 | |
parent | 4816a07266f1a4fcf5939c2f9088585819682d82 (diff) |
vmxnet3: remove device counter
An atomic counter of devices present is maintained but never used.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/vmxnet3/vmxnet3_drv.c | 5 | ||||
-rw-r--r-- | drivers/net/vmxnet3/vmxnet3_int.h | 1 |
2 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c index 0e5515393c16..1f66a7e3c25f 100644 --- a/drivers/net/vmxnet3/vmxnet3_drv.c +++ b/drivers/net/vmxnet3/vmxnet3_drv.c | |||
@@ -43,8 +43,6 @@ static DEFINE_PCI_DEVICE_TABLE(vmxnet3_pciid_table) = { | |||
43 | 43 | ||
44 | MODULE_DEVICE_TABLE(pci, vmxnet3_pciid_table); | 44 | MODULE_DEVICE_TABLE(pci, vmxnet3_pciid_table); |
45 | 45 | ||
46 | static atomic_t devices_found; | ||
47 | |||
48 | static int enable_mq = 1; | 46 | static int enable_mq = 1; |
49 | static int irq_share_mode; | 47 | static int irq_share_mode; |
50 | 48 | ||
@@ -3005,8 +3003,6 @@ vmxnet3_probe_device(struct pci_dev *pdev, | |||
3005 | SET_NETDEV_DEV(netdev, &pdev->dev); | 3003 | SET_NETDEV_DEV(netdev, &pdev->dev); |
3006 | vmxnet3_declare_features(adapter, dma64); | 3004 | vmxnet3_declare_features(adapter, dma64); |
3007 | 3005 | ||
3008 | adapter->dev_number = atomic_read(&devices_found); | ||
3009 | |||
3010 | adapter->share_intr = irq_share_mode; | 3006 | adapter->share_intr = irq_share_mode; |
3011 | if (adapter->share_intr == VMXNET3_INTR_BUDDYSHARE && | 3007 | if (adapter->share_intr == VMXNET3_INTR_BUDDYSHARE && |
3012 | adapter->num_tx_queues != adapter->num_rx_queues) | 3008 | adapter->num_tx_queues != adapter->num_rx_queues) |
@@ -3057,7 +3053,6 @@ vmxnet3_probe_device(struct pci_dev *pdev, | |||
3057 | } | 3053 | } |
3058 | 3054 | ||
3059 | vmxnet3_check_link(adapter, false); | 3055 | vmxnet3_check_link(adapter, false); |
3060 | atomic_inc(&devices_found); | ||
3061 | return 0; | 3056 | return 0; |
3062 | 3057 | ||
3063 | err_register: | 3058 | err_register: |
diff --git a/drivers/net/vmxnet3/vmxnet3_int.h b/drivers/net/vmxnet3/vmxnet3_int.h index 55465ed5835b..3198384689d9 100644 --- a/drivers/net/vmxnet3/vmxnet3_int.h +++ b/drivers/net/vmxnet3/vmxnet3_int.h | |||
@@ -352,7 +352,6 @@ struct vmxnet3_adapter { | |||
352 | 352 | ||
353 | unsigned long state; /* VMXNET3_STATE_BIT_xxx */ | 353 | unsigned long state; /* VMXNET3_STATE_BIT_xxx */ |
354 | 354 | ||
355 | int dev_number; | ||
356 | int share_intr; | 355 | int share_intr; |
357 | }; | 356 | }; |
358 | 357 | ||