net: ethernet: remove unnecessary platform_set_drvdata()
Subsystems (18)
PATCH v2 1/4 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 <[email protected]>
Acked-by Nicolas Ferre <[email protected]>
Acked-by Rob Herring <[email protected]>
Acked-by Roland Stigge <[email protected]>
Acked-by Mugunthan V N <[email protected]>
Reviewed-by H Hartley Sweeten <[email protected]>
Tested-by Roland Stigge <[email protected]>
--- drivers/net/ethernet/8390/ne.c | 1 - drivers/net/ethernet/adi/bfin_mac.c | 4 ---- drivers/net/ethernet/amd/au1000_eth.c | 2 -- drivers/net/ethernet/broadcom/bcm63xx_enet.c | 1 - drivers/net/ethernet/cadence/at91_ether.c | 1 - drivers/net/ethernet/cadence/macb.c | 2 -- drivers/net/ethernet/calxeda/xgmac.c | 2 -- drivers/net/ethernet/cirrus/ep93xx_eth.c | 1 - drivers/net/ethernet/davicom/dm9000.c | 2 -- drivers/net/ethernet/ethoc.c | 2 -- drivers/net/ethernet/faraday/ftgmac100.c | 2 -- drivers/net/ethernet/faraday/ftmac100.c | 2 -- drivers/net/ethernet/freescale/fec_main.c | 2 -- drivers/net/ethernet/korina.c | 1 - drivers/net/ethernet/marvell/mv643xx_eth.c | 2 -- drivers/net/ethernet/marvell/mvneta.c | 2 -- drivers/net/ethernet/marvell/pxa168_eth.c | 1 - drivers/net/ethernet/micrel/ks8695net.c | 1 - drivers/net/ethernet/micrel/ks8842.c | 1 - drivers/net/ethernet/micrel/ks8851_mll.c | 1 - drivers/net/ethernet/netx-eth.c | 1 - drivers/net/ethernet/nuvoton/w90p910_ether.c | 2 -- drivers/net/ethernet/nxp/lpc_eth.c | 2 -- drivers/net/ethernet/renesas/sh_eth.c | 1 - drivers/net/ethernet/s6gmac.c | 1 - drivers/net/ethernet/seeq/sgiseeq.c | 1 - drivers/net/ethernet/sgi/meth.c | 1 - drivers/net/ethernet/smsc/smc911x.c | 2 -- drivers/net/ethernet/smsc/smc91x.c | 3 --- drivers/net/ethernet/smsc/smsc911x.c | 2 -- drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 2 -- drivers/net/ethernet/ti/cpsw.c | 1 - drivers/net/ethernet/ti/davinci_emac.c | 2 -- drivers/net/ethernet/tundra/tsi108_eth.c | 1 - drivers/net/ethernet/wiznet/w5100.c | 2 -- drivers/net/ethernet/wiznet/w5300.c | 2 -- drivers/net/ethernet/xscale/ixp4xx_eth.c | 2 -- 37 files changed, 61 deletions(-)
drivers/net/ethernet/8390/ne.c +0 -1
@@ -849,7 +849,6 @@ static int ne_drv_remove(struct platform_device *pdev)free_irq (dev->irq, dev);release_region (dev->base_addr,NE_IO_EXTENT );free_netdev (dev); -platform_set_drvdata (pdev,NULL ); }return 0 ; }
drivers/net/ethernet/adi/bfin_mac.c +0 -4
@@ -1719,7 +1719,6 @@ out_err_mii_probe:mdiobus_unregister (lp->mii_bus);mdiobus_free (lp->mii_bus); out_err_probe_mac: -platform_set_drvdata (pdev,NULL );free_netdev (ndev);return rc;
@@ -1732,8 +1731,6 @@ static int bfin_mac_remove(struct platform_device *pdev)bfin_phc_release (lp); -platform_set_drvdata (pdev,NULL ); - lp->mii_bus->priv =NULL ;unregister_netdev (ndev);
@@ -1868,7 +1865,6 @@ static int bfin_mii_bus_remove(struct platform_device *pdev)struct bfin_mii_bus_platform_data *mii_bus_pd =dev_get_platdata (&pdev->dev); -platform_set_drvdata (pdev,NULL );mdiobus_unregister (miibus);kfree (miibus->irq);mdiobus_free (miibus);
drivers/net/ethernet/amd/au1000_eth.c +0 -2
@@ -1301,8 +1301,6 @@ static int au1000_remove(struct platform_device *pdev)int i;struct resource *base, *macen; -platform_set_drvdata (pdev,NULL ); -unregister_netdev (dev);mdiobus_unregister (aup->mii_bus);mdiobus_free (aup->mii_bus);
drivers/net/ethernet/broadcom/bcm63xx_enet.c +0 -1
@@ -1847,7 +1847,6 @@ static int bcm_enet_remove(struct platform_device *pdev)clk_disable_unprepare (priv->mac_clk);clk_put (priv->mac_clk); -platform_set_drvdata (pdev,NULL );free_netdev (dev);return 0 ; }
drivers/net/ethernet/cadence/at91_ether.c +0 -1
@@ -435,7 +435,6 @@ static int at91ether_remove(struct platform_device *pdev)unregister_netdev (dev);clk_disable (lp->pclk);free_netdev (dev); -platform_set_drvdata (pdev,NULL );return 0 ; }
drivers/net/ethernet/cadence/macb.c +0 -2
@@ -1649,7 +1649,6 @@ err_out_put_pclk: err_out_free_dev:free_netdev (dev); err_out: -platform_set_drvdata (pdev,NULL );return err; }
@@ -1675,7 +1674,6 @@ static int __exit macb_remove(struct platform_device *pdev)clk_disable_unprepare (bp->pclk);clk_put (bp->pclk);free_netdev (dev); -platform_set_drvdata (pdev,NULL ); }return 0 ;
drivers/net/ethernet/calxeda/xgmac.c +0 -2
@@ -1790,7 +1790,6 @@ err_io:free_netdev (ndev); err_alloc:release_mem_region (res->start,resource_size (res)); -platform_set_drvdata (pdev,NULL );return ret; }
@@ -1813,7 +1812,6 @@ static int xgmac_remove(struct platform_device *pdev)free_irq (ndev->irq, ndev);free_irq (priv->pmt_irq, ndev); -platform_set_drvdata (pdev,NULL );unregister_netdev (ndev);netif_napi_del (&priv->napi);
drivers/net/ethernet/cirrus/ep93xx_eth.c +0 -1
@@ -783,7 +783,6 @@ static int ep93xx_eth_remove(struct platform_device *pdev) dev =platform_get_drvdata (pdev);if (dev ==NULL )return 0 ; -platform_set_drvdata (pdev,NULL ); ep =netdev_priv (dev);
drivers/net/ethernet/davicom/dm9000.c +0 -2
@@ -1699,8 +1699,6 @@ dm9000_drv_remove(struct platform_device *pdev) {struct net_device *ndev =platform_get_drvdata (pdev); -platform_set_drvdata (pdev,NULL ); -unregister_netdev (ndev);dm9000_release_board (pdev,netdev_priv (ndev));free_netdev (ndev);/* free device structure */
drivers/net/ethernet/ethoc.c +0 -2
@@ -1147,8 +1147,6 @@ static int ethoc_remove(struct platform_device *pdev)struct net_device *netdev =platform_get_drvdata (pdev);struct ethoc *priv =netdev_priv (netdev); -platform_set_drvdata (pdev,NULL ); -if (netdev) {netif_napi_del (&priv->napi);phy_disconnect (priv->phy);
drivers/net/ethernet/faraday/ftgmac100.c +0 -2
@@ -1311,7 +1311,6 @@ err_ioremap:release_resource (priv->res); err_req_mem:netif_napi_del (&priv->napi); -platform_set_drvdata (pdev,NULL );free_netdev (netdev); err_alloc_etherdev:return err;
@@ -1335,7 +1334,6 @@ static int __exit ftgmac100_remove(struct platform_device *pdev)release_resource (priv->res);netif_napi_del (&priv->napi); -platform_set_drvdata (pdev,NULL );free_netdev (netdev);return 0 ; }
drivers/net/ethernet/faraday/ftmac100.c +0 -2
@@ -1149,7 +1149,6 @@ err_ioremap:release_resource (priv->res); err_req_mem:netif_napi_del (&priv->napi); -platform_set_drvdata (pdev,NULL );free_netdev (netdev); err_alloc_etherdev:return err;
@@ -1169,7 +1168,6 @@ static int __exit ftmac100_remove(struct platform_device *pdev)release_resource (priv->res);netif_napi_del (&priv->napi); -platform_set_drvdata (pdev,NULL );free_netdev (netdev);return 0 ; }
drivers/net/ethernet/freescale/fec_main.c +0 -2
@@ -2019,8 +2019,6 @@ fec_drv_remove(struct platform_device *pdev) }free_netdev (ndev); -platform_set_drvdata (pdev,NULL ); -return 0 ; }
drivers/net/ethernet/korina.c +0 -1
@@ -1211,7 +1211,6 @@ static int korina_remove(struct platform_device *pdev)iounmap (lp->rx_dma_regs);iounmap (lp->tx_dma_regs); -platform_set_drvdata (pdev,NULL );unregister_netdev (bif->dev);free_netdev (bif->dev);
drivers/net/ethernet/marvell/mv643xx_eth.c +0 -2
@@ -2813,8 +2813,6 @@ static int mv643xx_eth_remove(struct platform_device *pdev)free_netdev (mp->dev); -platform_set_drvdata (pdev,NULL ); -return 0 ; }
drivers/net/ethernet/marvell/mvneta.c +0 -2
@@ -2804,8 +2804,6 @@ static int mvneta_remove(struct platform_device *pdev)irq_dispose_mapping (dev->irq);free_netdev (dev); -platform_set_drvdata (pdev,NULL ); -return 0 ; }
drivers/net/ethernet/marvell/pxa168_eth.c +0 -1
@@ -1602,7 +1602,6 @@ static int pxa168_eth_remove(struct platform_device *pdev)unregister_netdev (dev);cancel_work_sync (&pep->tx_timeout_task);free_netdev (dev); -platform_set_drvdata (pdev,NULL );return 0 ; }
drivers/net/ethernet/micrel/ks8695net.c +0 -1
@@ -1600,7 +1600,6 @@ ks8695_drv_remove(struct platform_device *pdev)struct net_device *ndev =platform_get_drvdata (pdev);struct ks8695_priv *ksp =netdev_priv (ndev); -platform_set_drvdata (pdev,NULL );netif_napi_del (&ksp->napi);unregister_netdev (ndev);
drivers/net/ethernet/micrel/ks8842.c +0 -1
@@ -1250,7 +1250,6 @@ static int ks8842_remove(struct platform_device *pdev)iounmap (adapter->hw_addr);free_netdev (netdev);release_mem_region (iomem->start,resource_size (iomem)); -platform_set_drvdata (pdev,NULL );return 0 ; }
drivers/net/ethernet/micrel/ks8851_mll.c +0 -1
@@ -1671,7 +1671,6 @@ static int ks8851_remove(struct platform_device *pdev)iounmap (ks->hw_addr);free_netdev (netdev);release_mem_region (iomem->start,resource_size (iomem)); -platform_set_drvdata (pdev,NULL );return 0 ; }
drivers/net/ethernet/netx-eth.c +0 -1
@@ -422,7 +422,6 @@ exit_free_pfifo: exit_free_xc:free_xc (priv->xc); exit_free_netdev: -platform_set_drvdata (pdev,NULL );free_netdev (ndev); exit:return ret;
drivers/net/ethernet/nuvoton/w90p910_ether.c +0 -2
@@ -1051,7 +1051,6 @@ failed_put_clk:clk_put (ether->clk); failed_free_rxirq:free_irq (ether->rxirq, pdev); -platform_set_drvdata (pdev,NULL ); failed_free_txirq:free_irq (ether->txirq, pdev); failed_free_io:
@@ -1080,7 +1079,6 @@ static int w90p910_ether_remove(struct platform_device *pdev)free_irq (ether->rxirq, dev);del_timer_sync (ðer->check_timer); -platform_set_drvdata (pdev,NULL );free_netdev (dev);return 0 ;
drivers/net/ethernet/nxp/lpc_eth.c +0 -2
@@ -1483,7 +1483,6 @@ static int lpc_eth_drv_probe(struct platform_device *pdev)return 0 ; err_out_unregister_netdev: -platform_set_drvdata (pdev,NULL );unregister_netdev (ndev); err_out_dma_unmap: if (!use_iram_for_net(&pldat->pdev->dev) ||
@@ -1511,7 +1510,6 @@ static int lpc_eth_drv_remove(struct platform_device *pdev)struct netdata_local *pldat =netdev_priv (ndev);unregister_netdev (ndev); -platform_set_drvdata (pdev,NULL );if (!use_iram_for_net (&pldat->pdev->dev) || pldat->dma_buff_size >lpc32xx_return_iram_size ())
drivers/net/ethernet/renesas/sh_eth.c +0 -1
@@ -2803,7 +2803,6 @@ static int sh_eth_drv_remove(struct platform_device *pdev)unregister_netdev (ndev);pm_runtime_disable (&pdev->dev);free_netdev (ndev); -platform_set_drvdata (pdev,NULL );return 0 ; }
drivers/net/ethernet/s6gmac.c +0 -1
@@ -1040,7 +1040,6 @@ static int s6gmac_remove(struct platform_device *pdev)unregister_netdev (dev);free_irq (dev->irq, dev);free_netdev (dev); -platform_set_drvdata (pdev,NULL ); }return 0 ; }
drivers/net/ethernet/seeq/sgiseeq.c +0 -1
@@ -818,7 +818,6 @@ static int __exit sgiseeq_remove(struct platform_device *pdev)dma_free_noncoherent (&pdev->dev,sizeof (*sp->srings), sp->srings, sp->srings_dma);free_netdev (dev); -platform_set_drvdata (pdev,NULL );return 0 ; }
drivers/net/ethernet/sgi/meth.c +0 -1
@@ -863,7 +863,6 @@ static int __exit meth_remove(struct platform_device *pdev)unregister_netdev (dev);free_netdev (dev); -platform_set_drvdata (pdev,NULL );return 0 ; }
drivers/net/ethernet/smsc/smc911x.c +0 -2
@@ -2087,7 +2087,6 @@ static int smc911x_drv_probe(struct platform_device *pdev) ndev->base_addr = res->start; ret =smc911x_probe (ndev);if (ret !=0 ) { -platform_set_drvdata (pdev,NULL );iounmap (addr); release_both:free_netdev (ndev);
@@ -2113,7 +2112,6 @@ static int smc911x_drv_remove(struct platform_device *pdev)struct resource *res;DBG (SMC_DEBUG_FUNC ,"--> %s\n" , __func__); -platform_set_drvdata (pdev,NULL );unregister_netdev (ndev);
drivers/net/ethernet/smsc/smc91x.c +0 -3
@@ -2299,7 +2299,6 @@ static int smc_drv_probe(struct platform_device *pdev)return 0 ; out_iounmap: -platform_set_drvdata (pdev,NULL );iounmap (addr); out_release_attrib:smc_release_attrib (pdev, ndev);
@@ -2319,8 +2318,6 @@ static int smc_drv_remove(struct platform_device *pdev)struct smc_local *lp =netdev_priv (ndev);struct resource *res; -platform_set_drvdata (pdev,NULL ); -unregister_netdev (ndev);free_irq (ndev->irq, ndev);
drivers/net/ethernet/smsc/smsc911x.c +0 -2
@@ -2284,7 +2284,6 @@ static int smsc911x_drv_remove(struct platform_device *pdev)mdiobus_unregister (pdata->mii_bus);mdiobus_free (pdata->mii_bus); -platform_set_drvdata (pdev,NULL );unregister_netdev (dev);free_irq (dev->irq, dev); res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
@@ -2539,7 +2538,6 @@ out_disable_resources: out_enable_resources_fail:smsc911x_free_resources (pdev); out_request_resources_fail: -platform_set_drvdata (pdev,NULL );iounmap (pdata->ioaddr);free_netdev (dev); out_release_io_1:
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +0 -2
@@ -171,8 +171,6 @@ static int stmmac_pltfr_remove(struct platform_device *pdev)if (priv->plat->exit) priv->plat->exit (pdev); -platform_set_drvdata (pdev,NULL ); -return ret; }
drivers/net/ethernet/ti/cpsw.c +0 -1
@@ -1940,7 +1940,6 @@ static int cpsw_remove(struct platform_device *pdev)struct cpsw_priv *priv =netdev_priv (ndev);int i; -platform_set_drvdata (pdev,NULL );if (priv->data.dual_emac)unregister_netdev (cpsw_get_slave_ndev (priv,1 ));unregister_netdev (ndev);
drivers/net/ethernet/ti/davinci_emac.c +0 -2
@@ -2037,8 +2037,6 @@ static int davinci_emac_remove(struct platform_device *pdev)dev_notice (&ndev->dev,"DaVinci EMAC: davinci_emac_remove()\n" ); -platform_set_drvdata (pdev,NULL ); -if (priv->txchan)cpdma_chan_destroy (priv->txchan);if (priv->rxchan)
drivers/net/ethernet/tundra/tsi108_eth.c +0 -1
@@ -1682,7 +1682,6 @@ static int tsi108_ether_remove(struct platform_device *pdev)unregister_netdev (dev);tsi108_stop_ethernet (dev); -platform_set_drvdata (pdev,NULL );iounmap (priv->regs);iounmap (priv->phyregs);free_netdev (dev);
drivers/net/ethernet/wiznet/w5100.c +0 -2
@@ -734,7 +734,6 @@ err_hw_probe:unregister_netdev (ndev); err_register:free_netdev (ndev); -platform_set_drvdata (pdev,NULL );return err; }
@@ -750,7 +749,6 @@ static int w5100_remove(struct platform_device *pdev)unregister_netdev (ndev);free_netdev (ndev); -platform_set_drvdata (pdev,NULL );return 0 ; }
drivers/net/ethernet/wiznet/w5300.c +0 -2
@@ -646,7 +646,6 @@ err_hw_probe:unregister_netdev (ndev); err_register:free_netdev (ndev); -platform_set_drvdata (pdev,NULL );return err; }
@@ -662,7 +661,6 @@ static int w5300_remove(struct platform_device *pdev)unregister_netdev (ndev);free_netdev (ndev); -platform_set_drvdata (pdev,NULL );return 0 ; }
drivers/net/ethernet/xscale/ixp4xx_eth.c +0 -2
@@ -1472,7 +1472,6 @@ err_phy_dis:phy_disconnect (port->phydev); err_free_mem: npe_port_tab[NPE_ID (port->id)] =NULL ; -platform_set_drvdata (pdev,NULL );release_resource (port->mem_res); err_npe_rel:npe_release (port->npe);
@@ -1489,7 +1488,6 @@ static int eth_remove_one(struct platform_device *pdev)unregister_netdev (dev);phy_disconnect (port->phydev); npe_port_tab[NPE_ID (port->id)] =NULL ; -platform_set_drvdata (pdev,NULL );npe_release (port->npe);release_resource (port->mem_res);free_netdev (dev);
Signature · 1 line
1.7.10.4
From: Jingoo Han <[email protected]>
Date: Tue, 28 May 2013 14:01:12 +0900
Quoted 5 lines
The driver core clears the driver data to NULL after
device_releaseor on probe failure, since commit0998d0631001288a5974afc0b2a5f568bcdecb4d(device-core: Ensure drvdata = NULL when no driver is bound). Thus, it is not needed to manually clear the device driver data to NULL.
Quoted 7 lines
Signed-off-by Jingoo Han <[email protected]>Acked-by Nicolas Ferre <[email protected]>Acked-by Rob Herring <[email protected]>Acked-by Roland Stigge <[email protected]>Acked-by Mugunthan V N <[email protected]>Reviewed-by H Hartley Sweeten <[email protected]>Tested-by Roland Stigge <[email protected]>
Applied.