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

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

drivers/net/chelsio/cxgb2.c

+16 −16
Original line number Diff line number Diff line
@@ -1385,27 +1385,27 @@ static inline void t1_sw_reset(struct pci_dev *pdev) 
static void __devexit remove_one(struct pci_dev *pdev)

{

	struct net_device *dev = pci_get_drvdata(pdev);



	if (dev) {

		int i;

	struct adapter *adapter = dev->priv;

	int i;



		for_each_port(adapter, i)

	for_each_port(adapter, i) {

		if (test_bit(i, &adapter->registered_device_map))

			unregister_netdev(adapter->port[i].dev);

	}



	t1_free_sw_modules(adapter);

	iounmap(adapter->regs);

		while (--i >= 0)



	while (--i >= 0) {

		if (adapter->port[i].dev)

			free_netdev(adapter->port[i].dev);

	}



	pci_release_regions(pdev);

	pci_disable_device(pdev);

	pci_set_drvdata(pdev, NULL);

	t1_sw_reset(pdev);

}

}



static struct pci_driver driver = {

	.name     = DRV_NAME,