Skip to content

Commit 8f3a767

Browse files
Dimitris Michailidisdavem330
authored andcommitted
cxgb4: remove a bitmap
The driver keeps a bitmap of the netdevs it registered so it knows what to unregister later. Remove that and look at reg_state instead. Signed-off-by: Dimitris Michailidis <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent b1a3c2b commit 8f3a767

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

drivers/net/cxgb4/cxgb4.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,6 @@ struct adapter {
482482
void __iomem *regs;
483483
struct pci_dev *pdev;
484484
struct device *pdev_dev;
485-
unsigned long registered_device_map;
486485
unsigned int fn;
487486
unsigned int flags;
488487

drivers/net/cxgb4/cxgb4_main.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3725,7 +3725,6 @@ static int __devinit init_one(struct pci_dev *pdev,
37253725
err = register_netdev(adapter->port[i]);
37263726
if (err)
37273727
break;
3728-
__set_bit(i, &adapter->registered_device_map);
37293728
adapter->chan_map[pi->tx_chan] = i;
37303729
print_port_info(adapter->port[i]);
37313730
}
@@ -3785,7 +3784,7 @@ static void __devexit remove_one(struct pci_dev *pdev)
37853784
detach_ulds(adapter);
37863785

37873786
for_each_port(adapter, i)
3788-
if (test_bit(i, &adapter->registered_device_map))
3787+
if (adapter->port[i]->reg_state == NETREG_REGISTERED)
37893788
unregister_netdev(adapter->port[i]);
37903789

37913790
if (adapter->debugfs_root)

0 commit comments

Comments
 (0)