Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net: ethernet: remove unnecessary platform_set_drvdata()

The driver core clears the driver data to NULL after device_release
or on probe failure, since commit 0998d0631001288a5974afc0b2a5f568bcdecb4d
(device-core: Ensure drvdata = NULL when no driver is bound).
Thus, it is not needed to manually clear the device driver data to NULL.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Rob Herring <rob.herring@calxeda.com>
Acked-by: Roland Stigge <stigge@antcom.de>
Acked-by: Mugunthan V N <mugunthanvnm@ti.com>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Tested-by: Roland Stigge <stigge@antcom.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Jingoo Han and committed by
David S. Miller
dfd93c97 3acfeac3

-61
-1
drivers/net/ethernet/8390/ne.c
··· 849 849 free_irq(dev->irq, dev); 850 850 release_region(dev->base_addr, NE_IO_EXTENT); 851 851 free_netdev(dev); 852 - platform_set_drvdata(pdev, NULL); 853 852 } 854 853 return 0; 855 854 }
-4
drivers/net/ethernet/adi/bfin_mac.c
··· 1719 1719 mdiobus_unregister(lp->mii_bus); 1720 1720 mdiobus_free(lp->mii_bus); 1721 1721 out_err_probe_mac: 1722 - platform_set_drvdata(pdev, NULL); 1723 1722 free_netdev(ndev); 1724 1723 1725 1724 return rc; ··· 1730 1731 struct bfin_mac_local *lp = netdev_priv(ndev); 1731 1732 1732 1733 bfin_phc_release(lp); 1733 - 1734 - platform_set_drvdata(pdev, NULL); 1735 1734 1736 1735 lp->mii_bus->priv = NULL; 1737 1736 ··· 1865 1868 struct bfin_mii_bus_platform_data *mii_bus_pd = 1866 1869 dev_get_platdata(&pdev->dev); 1867 1870 1868 - platform_set_drvdata(pdev, NULL); 1869 1871 mdiobus_unregister(miibus); 1870 1872 kfree(miibus->irq); 1871 1873 mdiobus_free(miibus);
-2
drivers/net/ethernet/amd/au1000_eth.c
··· 1301 1301 int i; 1302 1302 struct resource *base, *macen; 1303 1303 1304 - platform_set_drvdata(pdev, NULL); 1305 - 1306 1304 unregister_netdev(dev); 1307 1305 mdiobus_unregister(aup->mii_bus); 1308 1306 mdiobus_free(aup->mii_bus);
-1
drivers/net/ethernet/broadcom/bcm63xx_enet.c
··· 1847 1847 clk_disable_unprepare(priv->mac_clk); 1848 1848 clk_put(priv->mac_clk); 1849 1849 1850 - platform_set_drvdata(pdev, NULL); 1851 1850 free_netdev(dev); 1852 1851 return 0; 1853 1852 }
-1
drivers/net/ethernet/cadence/at91_ether.c
··· 435 435 unregister_netdev(dev); 436 436 clk_disable(lp->pclk); 437 437 free_netdev(dev); 438 - platform_set_drvdata(pdev, NULL); 439 438 440 439 return 0; 441 440 }
-2
drivers/net/ethernet/cadence/macb.c
··· 1649 1649 err_out_free_dev: 1650 1650 free_netdev(dev); 1651 1651 err_out: 1652 - platform_set_drvdata(pdev, NULL); 1653 1652 return err; 1654 1653 } 1655 1654 ··· 1674 1675 clk_disable_unprepare(bp->pclk); 1675 1676 clk_put(bp->pclk); 1676 1677 free_netdev(dev); 1677 - platform_set_drvdata(pdev, NULL); 1678 1678 } 1679 1679 1680 1680 return 0;
-2
drivers/net/ethernet/calxeda/xgmac.c
··· 1790 1790 free_netdev(ndev); 1791 1791 err_alloc: 1792 1792 release_mem_region(res->start, resource_size(res)); 1793 - platform_set_drvdata(pdev, NULL); 1794 1793 return ret; 1795 1794 } 1796 1795 ··· 1812 1813 free_irq(ndev->irq, ndev); 1813 1814 free_irq(priv->pmt_irq, ndev); 1814 1815 1815 - platform_set_drvdata(pdev, NULL); 1816 1816 unregister_netdev(ndev); 1817 1817 netif_napi_del(&priv->napi); 1818 1818
-1
drivers/net/ethernet/cirrus/ep93xx_eth.c
··· 783 783 dev = platform_get_drvdata(pdev); 784 784 if (dev == NULL) 785 785 return 0; 786 - platform_set_drvdata(pdev, NULL); 787 786 788 787 ep = netdev_priv(dev); 789 788
-2
drivers/net/ethernet/davicom/dm9000.c
··· 1699 1699 { 1700 1700 struct net_device *ndev = platform_get_drvdata(pdev); 1701 1701 1702 - platform_set_drvdata(pdev, NULL); 1703 - 1704 1702 unregister_netdev(ndev); 1705 1703 dm9000_release_board(pdev, netdev_priv(ndev)); 1706 1704 free_netdev(ndev); /* free device structure */
-2
drivers/net/ethernet/ethoc.c
··· 1147 1147 struct net_device *netdev = platform_get_drvdata(pdev); 1148 1148 struct ethoc *priv = netdev_priv(netdev); 1149 1149 1150 - platform_set_drvdata(pdev, NULL); 1151 - 1152 1150 if (netdev) { 1153 1151 netif_napi_del(&priv->napi); 1154 1152 phy_disconnect(priv->phy);
-2
drivers/net/ethernet/faraday/ftgmac100.c
··· 1311 1311 release_resource(priv->res); 1312 1312 err_req_mem: 1313 1313 netif_napi_del(&priv->napi); 1314 - platform_set_drvdata(pdev, NULL); 1315 1314 free_netdev(netdev); 1316 1315 err_alloc_etherdev: 1317 1316 return err; ··· 1334 1335 release_resource(priv->res); 1335 1336 1336 1337 netif_napi_del(&priv->napi); 1337 - platform_set_drvdata(pdev, NULL); 1338 1338 free_netdev(netdev); 1339 1339 return 0; 1340 1340 }
-2
drivers/net/ethernet/faraday/ftmac100.c
··· 1149 1149 release_resource(priv->res); 1150 1150 err_req_mem: 1151 1151 netif_napi_del(&priv->napi); 1152 - platform_set_drvdata(pdev, NULL); 1153 1152 free_netdev(netdev); 1154 1153 err_alloc_etherdev: 1155 1154 return err; ··· 1168 1169 release_resource(priv->res); 1169 1170 1170 1171 netif_napi_del(&priv->napi); 1171 - platform_set_drvdata(pdev, NULL); 1172 1172 free_netdev(netdev); 1173 1173 return 0; 1174 1174 }
-2
drivers/net/ethernet/freescale/fec_main.c
··· 2024 2024 clk_disable_unprepare(fep->clk_ipg); 2025 2025 free_netdev(ndev); 2026 2026 2027 - platform_set_drvdata(pdev, NULL); 2028 - 2029 2027 return 0; 2030 2028 } 2031 2029
-1
drivers/net/ethernet/korina.c
··· 1211 1211 iounmap(lp->rx_dma_regs); 1212 1212 iounmap(lp->tx_dma_regs); 1213 1213 1214 - platform_set_drvdata(pdev, NULL); 1215 1214 unregister_netdev(bif->dev); 1216 1215 free_netdev(bif->dev); 1217 1216
-2
drivers/net/ethernet/marvell/mv643xx_eth.c
··· 2813 2813 2814 2814 free_netdev(mp->dev); 2815 2815 2816 - platform_set_drvdata(pdev, NULL); 2817 - 2818 2816 return 0; 2819 2817 } 2820 2818
-2
drivers/net/ethernet/marvell/mvneta.c
··· 2804 2804 irq_dispose_mapping(dev->irq); 2805 2805 free_netdev(dev); 2806 2806 2807 - platform_set_drvdata(pdev, NULL); 2808 - 2809 2807 return 0; 2810 2808 } 2811 2809
-1
drivers/net/ethernet/marvell/pxa168_eth.c
··· 1602 1602 unregister_netdev(dev); 1603 1603 cancel_work_sync(&pep->tx_timeout_task); 1604 1604 free_netdev(dev); 1605 - platform_set_drvdata(pdev, NULL); 1606 1605 return 0; 1607 1606 } 1608 1607
-1
drivers/net/ethernet/micrel/ks8695net.c
··· 1600 1600 struct net_device *ndev = platform_get_drvdata(pdev); 1601 1601 struct ks8695_priv *ksp = netdev_priv(ndev); 1602 1602 1603 - platform_set_drvdata(pdev, NULL); 1604 1603 netif_napi_del(&ksp->napi); 1605 1604 1606 1605 unregister_netdev(ndev);
-1
drivers/net/ethernet/micrel/ks8842.c
··· 1250 1250 iounmap(adapter->hw_addr); 1251 1251 free_netdev(netdev); 1252 1252 release_mem_region(iomem->start, resource_size(iomem)); 1253 - platform_set_drvdata(pdev, NULL); 1254 1253 return 0; 1255 1254 } 1256 1255
-1
drivers/net/ethernet/micrel/ks8851_mll.c
··· 1671 1671 iounmap(ks->hw_addr); 1672 1672 free_netdev(netdev); 1673 1673 release_mem_region(iomem->start, resource_size(iomem)); 1674 - platform_set_drvdata(pdev, NULL); 1675 1674 return 0; 1676 1675 1677 1676 }
-1
drivers/net/ethernet/netx-eth.c
··· 422 422 exit_free_xc: 423 423 free_xc(priv->xc); 424 424 exit_free_netdev: 425 - platform_set_drvdata(pdev, NULL); 426 425 free_netdev(ndev); 427 426 exit: 428 427 return ret;
-2
drivers/net/ethernet/nuvoton/w90p910_ether.c
··· 1051 1051 clk_put(ether->clk); 1052 1052 failed_free_rxirq: 1053 1053 free_irq(ether->rxirq, pdev); 1054 - platform_set_drvdata(pdev, NULL); 1055 1054 failed_free_txirq: 1056 1055 free_irq(ether->txirq, pdev); 1057 1056 failed_free_io: ··· 1079 1080 free_irq(ether->rxirq, dev); 1080 1081 1081 1082 del_timer_sync(&ether->check_timer); 1082 - platform_set_drvdata(pdev, NULL); 1083 1083 1084 1084 free_netdev(dev); 1085 1085 return 0;
-2
drivers/net/ethernet/nxp/lpc_eth.c
··· 1483 1483 return 0; 1484 1484 1485 1485 err_out_unregister_netdev: 1486 - platform_set_drvdata(pdev, NULL); 1487 1486 unregister_netdev(ndev); 1488 1487 err_out_dma_unmap: 1489 1488 if (!use_iram_for_net(&pldat->pdev->dev) || ··· 1510 1511 struct netdata_local *pldat = netdev_priv(ndev); 1511 1512 1512 1513 unregister_netdev(ndev); 1513 - platform_set_drvdata(pdev, NULL); 1514 1514 1515 1515 if (!use_iram_for_net(&pldat->pdev->dev) || 1516 1516 pldat->dma_buff_size > lpc32xx_return_iram_size())
-1
drivers/net/ethernet/renesas/sh_eth.c
··· 2803 2803 unregister_netdev(ndev); 2804 2804 pm_runtime_disable(&pdev->dev); 2805 2805 free_netdev(ndev); 2806 - platform_set_drvdata(pdev, NULL); 2807 2806 2808 2807 return 0; 2809 2808 }
-1
drivers/net/ethernet/s6gmac.c
··· 1040 1040 unregister_netdev(dev); 1041 1041 free_irq(dev->irq, dev); 1042 1042 free_netdev(dev); 1043 - platform_set_drvdata(pdev, NULL); 1044 1043 } 1045 1044 return 0; 1046 1045 }
-1
drivers/net/ethernet/seeq/sgiseeq.c
··· 818 818 dma_free_noncoherent(&pdev->dev, sizeof(*sp->srings), sp->srings, 819 819 sp->srings_dma); 820 820 free_netdev(dev); 821 - platform_set_drvdata(pdev, NULL); 822 821 823 822 return 0; 824 823 }
-1
drivers/net/ethernet/sgi/meth.c
··· 863 863 864 864 unregister_netdev(dev); 865 865 free_netdev(dev); 866 - platform_set_drvdata(pdev, NULL); 867 866 868 867 return 0; 869 868 }
-2
drivers/net/ethernet/smsc/smc911x.c
··· 2087 2087 ndev->base_addr = res->start; 2088 2088 ret = smc911x_probe(ndev); 2089 2089 if (ret != 0) { 2090 - platform_set_drvdata(pdev, NULL); 2091 2090 iounmap(addr); 2092 2091 release_both: 2093 2092 free_netdev(ndev); ··· 2112 2113 struct resource *res; 2113 2114 2114 2115 DBG(SMC_DEBUG_FUNC, "--> %s\n", __func__); 2115 - platform_set_drvdata(pdev, NULL); 2116 2116 2117 2117 unregister_netdev(ndev); 2118 2118
-3
drivers/net/ethernet/smsc/smc91x.c
··· 2299 2299 return 0; 2300 2300 2301 2301 out_iounmap: 2302 - platform_set_drvdata(pdev, NULL); 2303 2302 iounmap(addr); 2304 2303 out_release_attrib: 2305 2304 smc_release_attrib(pdev, ndev); ··· 2317 2318 struct net_device *ndev = platform_get_drvdata(pdev); 2318 2319 struct smc_local *lp = netdev_priv(ndev); 2319 2320 struct resource *res; 2320 - 2321 - platform_set_drvdata(pdev, NULL); 2322 2321 2323 2322 unregister_netdev(ndev); 2324 2323
-2
drivers/net/ethernet/smsc/smsc911x.c
··· 2284 2284 mdiobus_unregister(pdata->mii_bus); 2285 2285 mdiobus_free(pdata->mii_bus); 2286 2286 2287 - platform_set_drvdata(pdev, NULL); 2288 2287 unregister_netdev(dev); 2289 2288 free_irq(dev->irq, dev); 2290 2289 res = platform_get_resource_byname(pdev, IORESOURCE_MEM, ··· 2538 2539 out_enable_resources_fail: 2539 2540 smsc911x_free_resources(pdev); 2540 2541 out_request_resources_fail: 2541 - platform_set_drvdata(pdev, NULL); 2542 2542 iounmap(pdata->ioaddr); 2543 2543 free_netdev(dev); 2544 2544 out_release_io_1:
-2
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
··· 171 171 if (priv->plat->exit) 172 172 priv->plat->exit(pdev); 173 173 174 - platform_set_drvdata(pdev, NULL); 175 - 176 174 return ret; 177 175 } 178 176
-1
drivers/net/ethernet/ti/cpsw.c
··· 1940 1940 struct cpsw_priv *priv = netdev_priv(ndev); 1941 1941 int i; 1942 1942 1943 - platform_set_drvdata(pdev, NULL); 1944 1943 if (priv->data.dual_emac) 1945 1944 unregister_netdev(cpsw_get_slave_ndev(priv, 1)); 1946 1945 unregister_netdev(ndev);
-2
drivers/net/ethernet/ti/davinci_emac.c
··· 2037 2037 2038 2038 dev_notice(&ndev->dev, "DaVinci EMAC: davinci_emac_remove()\n"); 2039 2039 2040 - platform_set_drvdata(pdev, NULL); 2041 - 2042 2040 if (priv->txchan) 2043 2041 cpdma_chan_destroy(priv->txchan); 2044 2042 if (priv->rxchan)
-1
drivers/net/ethernet/tundra/tsi108_eth.c
··· 1682 1682 1683 1683 unregister_netdev(dev); 1684 1684 tsi108_stop_ethernet(dev); 1685 - platform_set_drvdata(pdev, NULL); 1686 1685 iounmap(priv->regs); 1687 1686 iounmap(priv->phyregs); 1688 1687 free_netdev(dev);
-2
drivers/net/ethernet/wiznet/w5100.c
··· 734 734 unregister_netdev(ndev); 735 735 err_register: 736 736 free_netdev(ndev); 737 - platform_set_drvdata(pdev, NULL); 738 737 return err; 739 738 } 740 739 ··· 749 750 750 751 unregister_netdev(ndev); 751 752 free_netdev(ndev); 752 - platform_set_drvdata(pdev, NULL); 753 753 return 0; 754 754 } 755 755
-2
drivers/net/ethernet/wiznet/w5300.c
··· 646 646 unregister_netdev(ndev); 647 647 err_register: 648 648 free_netdev(ndev); 649 - platform_set_drvdata(pdev, NULL); 650 649 return err; 651 650 } 652 651 ··· 661 662 662 663 unregister_netdev(ndev); 663 664 free_netdev(ndev); 664 - platform_set_drvdata(pdev, NULL); 665 665 return 0; 666 666 } 667 667
-2
drivers/net/ethernet/xscale/ixp4xx_eth.c
··· 1472 1472 phy_disconnect(port->phydev); 1473 1473 err_free_mem: 1474 1474 npe_port_tab[NPE_ID(port->id)] = NULL; 1475 - platform_set_drvdata(pdev, NULL); 1476 1475 release_resource(port->mem_res); 1477 1476 err_npe_rel: 1478 1477 npe_release(port->npe); ··· 1488 1489 unregister_netdev(dev); 1489 1490 phy_disconnect(port->phydev); 1490 1491 npe_port_tab[NPE_ID(port->id)] = NULL; 1491 - platform_set_drvdata(pdev, NULL); 1492 1492 npe_release(port->npe); 1493 1493 release_resource(port->mem_res); 1494 1494 free_netdev(dev);