Commit 47cbe6f4 authored by Francois Romieu's avatar Francois Romieu Committed by Jeff Garzik

chelsio: useless test in cxgb2::remove_one

pci_get_drvadata() is necessarily distinct from NULL if
cxgb2::init_one succeeded. cxgb2::remove_one is solely
issued through the PCI device callback.
Signed-off-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
parent d7487421
...@@ -1385,26 +1385,26 @@ static inline void t1_sw_reset(struct pci_dev *pdev) ...@@ -1385,26 +1385,26 @@ static inline void t1_sw_reset(struct pci_dev *pdev)
static void __devexit remove_one(struct pci_dev *pdev) static void __devexit remove_one(struct pci_dev *pdev)
{ {
struct net_device *dev = pci_get_drvdata(pdev); struct net_device *dev = pci_get_drvdata(pdev);
struct adapter *adapter = dev->priv;
int i;
if (dev) { for_each_port(adapter, i) {
int i; if (test_bit(i, &adapter->registered_device_map))
struct adapter *adapter = dev->priv; unregister_netdev(adapter->port[i].dev);
}
for_each_port(adapter, i)
if (test_bit(i, &adapter->registered_device_map))
unregister_netdev(adapter->port[i].dev);
t1_free_sw_modules(adapter); t1_free_sw_modules(adapter);
iounmap(adapter->regs); iounmap(adapter->regs);
while (--i >= 0)
if (adapter->port[i].dev)
free_netdev(adapter->port[i].dev);
pci_release_regions(pdev); while (--i >= 0) {
pci_disable_device(pdev); if (adapter->port[i].dev)
pci_set_drvdata(pdev, NULL); free_netdev(adapter->port[i].dev);
t1_sw_reset(pdev);
} }
pci_release_regions(pdev);
pci_disable_device(pdev);
pci_set_drvdata(pdev, NULL);
t1_sw_reset(pdev);
} }
static struct pci_driver driver = { static struct pci_driver driver = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment