forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drivers: net: cpsw: use of_platform_depopulate()

Browse source 
Use of_platform_depopulate() in cpsw_remove() instead of
of_device_unregister(), because CSPW child devices will not be
recreated otherwise on next insmod. of_platform_depopulate() is
correct way now as it will ensure that all steps done in
of_platform_populate() are reverted, including cleaning up of
OF_POPULATED flag.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Reviewed-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Grygorii Strashko 2016-07-28 20:50:36 +03:00 • committed by David S. Miller
parent 8a0b6dc958
commit 3bf2cb3ab5
1 changed files with 1 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
drivers/net/ethernet/ti/cpsw.c
View file

@ -2564,15 +2564,6 @@ clean_ndev_ret:
return ret; return ret;
} }
static int cpsw_remove_child_device(struct device *dev, void *c)
{
struct platform_device *pdev = to_platform_device(dev);
of_device_unregister(pdev);
return 0;
}
static int cpsw_remove(struct platform_device *pdev) static int cpsw_remove(struct platform_device *pdev)
{ {
struct net_device *ndev = platform_get_drvdata(pdev); struct net_device *ndev = platform_get_drvdata(pdev);
@ -2591,7 +2582,7 @@ static int cpsw_remove(struct platform_device *pdev)
cpsw_ale_destroy(priv->ale); cpsw_ale_destroy(priv->ale);
cpdma_ctlr_destroy(priv->dma); cpdma_ctlr_destroy(priv->dma);
device_for_each_child(&pdev->dev, NULL, cpsw_remove_child_device); of_platform_depopulate(&pdev->dev);
pm_runtime_put_sync(&pdev->dev); pm_runtime_put_sync(&pdev->dev);
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
if (priv->data.dual_emac) if (priv->data.dual_emac)