Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c5b9caf authored by Jingoo Han's avatar Jingoo Han Committed by David S. Miller
Browse files

net: tulip: remove unnecessary pci_set_drvdata() 



The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.

Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5eccdfaa

drivers/net/ethernet/dec/tulip/de2104x.c

+0 −1
Original line number Diff line number Diff line
@@ -2110,7 +2110,6 @@ static void de_remove_one(struct pci_dev *pdev) 
	iounmap(de->regs);

	pci_release_regions(pdev);

	pci_disable_device(pdev);

	pci_set_drvdata(pdev, NULL);

	free_netdev(dev);

}

drivers/net/ethernet/dec/tulip/dmfe.c

+0 −3
Original line number Diff line number Diff line
@@ -523,7 +523,6 @@ static int dmfe_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
err_out_disable:

	pci_disable_device(pdev);

err_out_free:

	pci_set_drvdata(pdev, NULL);

	free_netdev(dev);



	return err;
@@ -548,8 +547,6 @@ static void dmfe_remove_one(struct pci_dev *pdev) 
					db->buf_pool_ptr, db->buf_pool_dma_ptr);

		pci_release_regions(pdev);

		free_netdev(dev);	/* free board information */



		pci_set_drvdata(pdev, NULL);

	}



	DMFE_DBUG(0, "dmfe_remove_one() exit", 0);

drivers/net/ethernet/dec/tulip/tulip_core.c

+0 −1
Original line number Diff line number Diff line
@@ -1939,7 +1939,6 @@ static void tulip_remove_one(struct pci_dev *pdev) 
	pci_iounmap(pdev, tp->base_addr);

	free_netdev (dev);

	pci_release_regions (pdev);

	pci_set_drvdata (pdev, NULL);



	/* pci_power_off (pdev, -1); */

}

drivers/net/ethernet/dec/tulip/uli526x.c

+0 −2
Original line number Diff line number Diff line
@@ -429,7 +429,6 @@ static int uli526x_init_one(struct pci_dev *pdev, 
err_out_disable:

	pci_disable_device(pdev);

err_out_free:

	pci_set_drvdata(pdev, NULL);

	free_netdev(dev);



	return err;
@@ -450,7 +449,6 @@ static void uli526x_remove_one(struct pci_dev *pdev) 
				db->buf_pool_ptr, db->buf_pool_dma_ptr);

	pci_release_regions(pdev);

	pci_disable_device(pdev);

	pci_set_drvdata(pdev, NULL);

	free_netdev(dev);

}

drivers/net/ethernet/dec/tulip/winbond-840.c

+0 −3
Original line number Diff line number Diff line
@@ -468,7 +468,6 @@ static int w840_probe1(struct pci_dev *pdev, const struct pci_device_id *ent) 
	return 0;



err_out_cleardev:

	pci_set_drvdata(pdev, NULL);

	pci_iounmap(pdev, ioaddr);

err_out_free_res:

	pci_release_regions(pdev);
@@ -1542,8 +1541,6 @@ static void w840_remove1(struct pci_dev *pdev) 
		pci_iounmap(pdev, np->base_addr);

		free_netdev(dev);

	}



	pci_set_drvdata(pdev, NULL);

}



#ifdef CONFIG_PM