aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/smsc
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ethernet/smsc')
-rw-r--r--drivers/net/ethernet/smsc/smc911x.c2
-rw-r--r--drivers/net/ethernet/smsc/smc91x.c3
-rw-r--r--drivers/net/ethernet/smsc/smsc911x.c2
3 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/ethernet/smsc/smc911x.c b/drivers/net/ethernet/smsc/smc911x.c
index 9dd842dbb859..345558fe7367 100644
--- a/drivers/net/ethernet/smsc/smc911x.c
+++ b/drivers/net/ethernet/smsc/smc911x.c
@@ -2087,7 +2087,6 @@ static int smc911x_drv_probe(struct platform_device *pdev)
2087 ndev->base_addr = res->start; 2087 ndev->base_addr = res->start;
2088 ret = smc911x_probe(ndev); 2088 ret = smc911x_probe(ndev);
2089 if (ret != 0) { 2089 if (ret != 0) {
2090 platform_set_drvdata(pdev, NULL);
2091 iounmap(addr); 2090 iounmap(addr);
2092release_both: 2091release_both:
2093 free_netdev(ndev); 2092 free_netdev(ndev);
@@ -2113,7 +2112,6 @@ static int smc911x_drv_remove(struct platform_device *pdev)
2113 struct resource *res; 2112 struct resource *res;
2114 2113
2115 DBG(SMC_DEBUG_FUNC, "--> %s\n", __func__); 2114 DBG(SMC_DEBUG_FUNC, "--> %s\n", __func__);
2116 platform_set_drvdata(pdev, NULL);
2117 2115
2118 unregister_netdev(ndev); 2116 unregister_netdev(ndev);
2119 2117
diff --git a/drivers/net/ethernet/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c
index dfbf978315df..cde13be7c7de 100644
--- a/drivers/net/ethernet/smsc/smc91x.c
+++ b/drivers/net/ethernet/smsc/smc91x.c
@@ -2299,7 +2299,6 @@ static int smc_drv_probe(struct platform_device *pdev)
2299 return 0; 2299 return 0;
2300 2300
2301 out_iounmap: 2301 out_iounmap:
2302 platform_set_drvdata(pdev, NULL);
2303 iounmap(addr); 2302 iounmap(addr);
2304 out_release_attrib: 2303 out_release_attrib:
2305 smc_release_attrib(pdev, ndev); 2304 smc_release_attrib(pdev, ndev);
@@ -2319,8 +2318,6 @@ static int smc_drv_remove(struct platform_device *pdev)
2319 struct smc_local *lp = netdev_priv(ndev); 2318 struct smc_local *lp = netdev_priv(ndev);
2320 struct resource *res; 2319 struct resource *res;
2321 2320
2322 platform_set_drvdata(pdev, NULL);
2323
2324 unregister_netdev(ndev); 2321 unregister_netdev(ndev);
2325 2322
2326 free_irq(ndev->irq, ndev); 2323 free_irq(ndev->irq, ndev);
diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c
index 3663b9e04a31..a1419211585b 100644
--- a/drivers/net/ethernet/smsc/smsc911x.c
+++ b/drivers/net/ethernet/smsc/smsc911x.c
@@ -2284,7 +2284,6 @@ static int smsc911x_drv_remove(struct platform_device *pdev)
2284 mdiobus_unregister(pdata->mii_bus); 2284 mdiobus_unregister(pdata->mii_bus);
2285 mdiobus_free(pdata->mii_bus); 2285 mdiobus_free(pdata->mii_bus);
2286 2286
2287 platform_set_drvdata(pdev, NULL);
2288 unregister_netdev(dev); 2287 unregister_netdev(dev);
2289 free_irq(dev->irq, dev); 2288 free_irq(dev->irq, dev);
2290 res = platform_get_resource_byname(pdev, IORESOURCE_MEM, 2289 res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
@@ -2539,7 +2538,6 @@ out_disable_resources:
2539out_enable_resources_fail: 2538out_enable_resources_fail:
2540 smsc911x_free_resources(pdev); 2539 smsc911x_free_resources(pdev);
2541out_request_resources_fail: 2540out_request_resources_fail:
2542 platform_set_drvdata(pdev, NULL);
2543 iounmap(pdata->ioaddr); 2541 iounmap(pdata->ioaddr);
2544 free_netdev(dev); 2542 free_netdev(dev);
2545out_release_io_1: 2543out_release_io_1: