leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fec: Do not enable/disable optional clocks unconditionally

Browse Source 
clk_enet_out and clk_ptp are optional clocks, so we should not enable/disable
them unconditionally.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Fabio Estevam 2013-07-21 13:24:59 -03:00 committed by David S. Miller
parent eda2977291
commit 9514fe7a23
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/net/ethernet/freescale/fec_main.c
View File

@ -2105,8 +2105,10 @@ fec_probe(struct platform_device *pdev)
clk_prepare_enable(fep->clk_ahb); clk_prepare_enable(fep->clk_ahb);
clk_prepare_enable(fep->clk_ipg); clk_prepare_enable(fep->clk_ipg);
clk_prepare_enable(fep->clk_enet_out); if (fep->clk_enet_out)
clk_prepare_enable(fep->clk_ptp); clk_prepare_enable(fep->clk_enet_out);
if (fep->clk_ptp)
clk_prepare_enable(fep->clk_ptp);
fep->reg_phy = devm_regulator_get(&pdev->dev, "phy"); fep->reg_phy = devm_regulator_get(&pdev->dev, "phy");
if (!IS_ERR(fep->reg_phy)) { if (!IS_ERR(fep->reg_phy)) {
@ -2179,8 +2181,10 @@ failed_init:
failed_regulator: failed_regulator:
clk_disable_unprepare(fep->clk_ahb); clk_disable_unprepare(fep->clk_ahb);
clk_disable_unprepare(fep->clk_ipg); clk_disable_unprepare(fep->clk_ipg);
clk_disable_unprepare(fep->clk_enet_out); if (fep->clk_enet_out)
clk_disable_unprepare(fep->clk_ptp); clk_disable_unprepare(fep->clk_enet_out);
if (fep->clk_ptp)
clk_disable_unprepare(fep->clk_ptp);
failed_clk: failed_clk:
failed_ioremap: failed_ioremap:
free_netdev(ndev); free_netdev(ndev);
@ -2206,10 +2210,12 @@ fec_drv_remove(struct platform_device *pdev)
} }
if (fep->reg_phy) if (fep->reg_phy)
regulator_disable(fep->reg_phy); regulator_disable(fep->reg_phy);
clk_disable_unprepare(fep->clk_ptp); if (fep->clk_ptp)
clk_disable_unprepare(fep->clk_ptp);
if (fep->ptp_clock) if (fep->ptp_clock)
ptp_clock_unregister(fep->ptp_clock); ptp_clock_unregister(fep->ptp_clock);
clk_disable_unprepare(fep->clk_enet_out); if (fep->clk_enet_out)
clk_disable_unprepare(fep->clk_enet_out);
clk_disable_unprepare(fep->clk_ahb); clk_disable_unprepare(fep->clk_ahb);
clk_disable_unprepare(fep->clk_ipg); clk_disable_unprepare(fep->clk_ipg);
free_netdev(ndev); free_netdev(ndev);
@ -2228,7 +2234,8 @@ fec_suspend(struct device *dev)
fec_stop(ndev); fec_stop(ndev);
netif_device_detach(ndev); netif_device_detach(ndev);
} }
clk_disable_unprepare(fep->clk_enet_out); if (fep->clk_enet_out)
clk_disable_unprepare(fep->clk_enet_out);
clk_disable_unprepare(fep->clk_ahb); clk_disable_unprepare(fep->clk_ahb);
clk_disable_unprepare(fep->clk_ipg); clk_disable_unprepare(fep->clk_ipg);
@ -2251,7 +2258,8 @@ fec_resume(struct device *dev)
return ret; return ret;
} }
clk_prepare_enable(fep->clk_enet_out); if (fep->clk_enet_out)
clk_prepare_enable(fep->clk_enet_out);
clk_prepare_enable(fep->clk_ahb); clk_prepare_enable(fep->clk_ahb);
clk_prepare_enable(fep->clk_ipg); clk_prepare_enable(fep->clk_ipg);
if (netif_running(ndev)) { if (netif_running(ndev)) {