aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRichard Zhao <richard.zhao@linaro.org>2011-11-15 01:48:07 -0500
committerShawn Guo <shawn.guo@linaro.org>2011-12-28 08:26:42 -0500
commit0ebafefcaa7a383b728d977a718e23e69ce84050 (patch)
tree5eaafa7e492095f087c9f12d59de44f4b99a67b3 /drivers
parentae68f7af05dbce25889ab10b302fba927dcdb295 (diff)
net: fec: add clk_prepare/clk_unprepare
It's for migrating to generic clk framework API. Signed-off-by: Richard Zhao <richard.zhao@linaro.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Cc: David S. Miller <davem@davemloft.net> Acked-by: Marek Vasut <marek.vasut@gmail.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/freescale/fec.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/ethernet/freescale/fec.c b/drivers/net/ethernet/freescale/fec.c
index c136230d50bb..112af9b056dc 100644
--- a/drivers/net/ethernet/freescale/fec.c
+++ b/drivers/net/ethernet/freescale/fec.c
@@ -1591,7 +1591,7 @@ fec_probe(struct platform_device *pdev)
1591 ret = PTR_ERR(fep->clk); 1591 ret = PTR_ERR(fep->clk);
1592 goto failed_clk; 1592 goto failed_clk;
1593 } 1593 }
1594 clk_enable(fep->clk); 1594 clk_prepare_enable(fep->clk);
1595 1595
1596 ret = fec_enet_init(ndev); 1596 ret = fec_enet_init(ndev);
1597 if (ret) 1597 if (ret)
@@ -1614,7 +1614,7 @@ failed_register:
1614 fec_enet_mii_remove(fep); 1614 fec_enet_mii_remove(fep);
1615failed_mii_init: 1615failed_mii_init:
1616failed_init: 1616failed_init:
1617 clk_disable(fep->clk); 1617 clk_disable_unprepare(fep->clk);
1618 clk_put(fep->clk); 1618 clk_put(fep->clk);
1619failed_clk: 1619failed_clk:
1620 for (i = 0; i < FEC_IRQ_NUM; i++) { 1620 for (i = 0; i < FEC_IRQ_NUM; i++) {
@@ -1641,7 +1641,7 @@ fec_drv_remove(struct platform_device *pdev)
1641 1641
1642 fec_stop(ndev); 1642 fec_stop(ndev);
1643 fec_enet_mii_remove(fep); 1643 fec_enet_mii_remove(fep);
1644 clk_disable(fep->clk); 1644 clk_disable_unprepare(fep->clk);
1645 clk_put(fep->clk); 1645 clk_put(fep->clk);
1646 iounmap(fep->hwp); 1646 iounmap(fep->hwp);
1647 unregister_netdev(ndev); 1647 unregister_netdev(ndev);
@@ -1667,7 +1667,7 @@ fec_suspend(struct device *dev)
1667 fec_stop(ndev); 1667 fec_stop(ndev);
1668 netif_device_detach(ndev); 1668 netif_device_detach(ndev);
1669 } 1669 }
1670 clk_disable(fep->clk); 1670 clk_disable_unprepare(fep->clk);
1671 1671
1672 return 0; 1672 return 0;
1673} 1673}
@@ -1678,7 +1678,7 @@ fec_resume(struct device *dev)
1678 struct net_device *ndev = dev_get_drvdata(dev); 1678 struct net_device *ndev = dev_get_drvdata(dev);
1679 struct fec_enet_private *fep = netdev_priv(ndev); 1679 struct fec_enet_private *fep = netdev_priv(ndev);
1680 1680
1681 clk_enable(fep->clk); 1681 clk_prepare_enable(fep->clk);
1682 if (netif_running(ndev)) { 1682 if (netif_running(ndev)) {
1683 fec_restart(ndev, fep->full_duplex); 1683 fec_restart(ndev, fep->full_duplex);
1684 netif_device_attach(ndev); 1684 netif_device_attach(ndev);