[PATCH 03/12] net: fec: add clk_prepare/clk_unprepare
Marek Vasut
marek.vasut at gmail.com
Tue Dec 20 08:45:03 EST 2011
> From: Richard Zhao <richard.zhao at linaro.org>
>
> It's for migrating to generic clk framework API.
>
> Signed-off-by: Richard Zhao <richard.zhao at linaro.org>
> Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
> Signed-off-by: Shawn Guo <shawn.guo at linaro.org>
> Cc: David S. Miller <davem at davemloft.net>
> ---
> drivers/net/ethernet/freescale/fec.c | 10 +++++-----
> 1 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/ethernet/freescale/fec.c
> b/drivers/net/ethernet/freescale/fec.c index c136230..112af9b 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)
> ret = PTR_ERR(fep->clk);
> goto failed_clk;
> }
> - clk_enable(fep->clk);
> + clk_prepare_enable(fep->clk);
>
> ret = fec_enet_init(ndev);
> if (ret)
> @@ -1614,7 +1614,7 @@ failed_register:
> fec_enet_mii_remove(fep);
> failed_mii_init:
> failed_init:
> - clk_disable(fep->clk);
> + clk_disable_unprepare(fep->clk);
> clk_put(fep->clk);
> failed_clk:
> for (i = 0; i < FEC_IRQ_NUM; i++) {
> @@ -1641,7 +1641,7 @@ fec_drv_remove(struct platform_device *pdev)
>
> fec_stop(ndev);
> fec_enet_mii_remove(fep);
> - clk_disable(fep->clk);
> + clk_disable_unprepare(fep->clk);
> clk_put(fep->clk);
> iounmap(fep->hwp);
> unregister_netdev(ndev);
> @@ -1667,7 +1667,7 @@ fec_suspend(struct device *dev)
> fec_stop(ndev);
> netif_device_detach(ndev);
> }
> - clk_disable(fep->clk);
> + clk_disable_unprepare(fep->clk);
>
> return 0;
> }
> @@ -1678,7 +1678,7 @@ fec_resume(struct device *dev)
> struct net_device *ndev = dev_get_drvdata(dev);
> struct fec_enet_private *fep = netdev_priv(ndev);
>
> - clk_enable(fep->clk);
> + clk_prepare_enable(fep->clk);
> if (netif_running(ndev)) {
> fec_restart(ndev, fep->full_duplex);
> netif_device_attach(ndev);
Looks ok
Acked-by: Marek Vasut <marek.vasut at gmail.com>
More information about the linux-arm-kernel
mailing list