aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-10-22 00:17:11 -0400
committerDavid S. Miller <davem@davemloft.net>2013-10-22 02:11:52 -0400
commit726a2fbe7b02ef24a4aeaef7df905148fa03ba71 (patch)
treef091c4556fc1c52ac1b853e7ab342cb7ab881d45
parent901ea1a939a69e8aab99a8e685ad5a815be8a342 (diff)
net: r6040: 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: Jingoo Han <jg1.han@samsung.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/rdc/r6040.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/ethernet/rdc/r6040.c b/drivers/net/ethernet/rdc/r6040.c
index e9dc84943cfc..1e49ec5b2232 100644
--- a/drivers/net/ethernet/rdc/r6040.c
+++ b/drivers/net/ethernet/rdc/r6040.c
@@ -1231,7 +1231,6 @@ err_out_mdio:
1231 mdiobus_free(lp->mii_bus); 1231 mdiobus_free(lp->mii_bus);
1232err_out_unmap: 1232err_out_unmap:
1233 netif_napi_del(&lp->napi); 1233 netif_napi_del(&lp->napi);
1234 pci_set_drvdata(pdev, NULL);
1235 pci_iounmap(pdev, ioaddr); 1234 pci_iounmap(pdev, ioaddr);
1236err_out_free_res: 1235err_out_free_res:
1237 pci_release_regions(pdev); 1236 pci_release_regions(pdev);
@@ -1257,7 +1256,6 @@ static void r6040_remove_one(struct pci_dev *pdev)
1257 pci_release_regions(pdev); 1256 pci_release_regions(pdev);
1258 free_netdev(dev); 1257 free_netdev(dev);
1259 pci_disable_device(pdev); 1258 pci_disable_device(pdev);
1260 pci_set_drvdata(pdev, NULL);
1261} 1259}
1262 1260
1263 1261