From: marek.vasut@gmail.com (Marek Vasut)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 03/12] net: fec: add clk_prepare/clk_unprepare
Date: Tue, 20 Dec 2011 14:45:03 +0100 [thread overview]
Message-ID: <201112201445.03521.marek.vasut@gmail.com> (raw)
In-Reply-To: <1324382443-4439-4-git-send-email-shawn.guo@linaro.org>
> From: Richard Zhao <richard.zhao@linaro.org>
>
> 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>
> ---
> 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@gmail.com>
next prev parent reply other threads:[~2011-12-20 13:45 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-20 12:00 [PATCH 0/12] Add clk_prepare/clk_unprepare for mxs clock api Shawn Guo
2011-12-20 12:00 ` [PATCH 01/12] clk: add helper functions clk_prepare_enable and clk_disable_unprepare Shawn Guo
2011-12-20 13:48 ` Marek Vasut
2011-12-20 14:09 ` Shawn Guo
2011-12-20 12:00 ` [PATCH 02/12] arm/mxs: convert platform code to clk_prepare/clk_unprepare Shawn Guo
2011-12-20 13:44 ` Marek Vasut
2011-12-20 21:11 ` Russell King - ARM Linux
2011-12-20 21:28 ` Marek Vasut
2011-12-20 12:00 ` [PATCH 03/12] net: fec: add clk_prepare/clk_unprepare Shawn Guo
2011-12-20 13:45 ` Marek Vasut [this message]
2011-12-20 12:00 ` [PATCH 04/12] dma: mxs-dma: convert to clk_prepare/clk_unprepare Shawn Guo
2011-12-20 13:45 ` Marek Vasut
2011-12-23 17:35 ` Vinod Koul
2011-12-20 12:00 ` [PATCH 05/12] mmc: mxs-mmc: " Shawn Guo
2011-12-20 13:45 ` Marek Vasut
2011-12-20 12:00 ` [PATCH 06/12] mtd: gpmi-lib: " Shawn Guo
2011-12-20 13:46 ` Marek Vasut
2011-12-20 12:00 ` [PATCH 07/12] net: flexcan: " Shawn Guo
2011-12-20 13:48 ` Marek Vasut
2011-12-20 14:23 ` Shawn Guo
2011-12-20 12:00 ` [PATCH 08/12] serial: mxs-auart: " Shawn Guo
2011-12-20 13:49 ` Marek Vasut
2011-12-20 14:07 ` Uwe Kleine-König
2011-12-20 21:15 ` Russell King - ARM Linux
2011-12-20 21:28 ` Marek Vasut
2011-12-20 22:24 ` Russell King - ARM Linux
2011-12-21 1:06 ` Marek Vasut
2011-12-20 14:27 ` Shawn Guo
2011-12-20 12:00 ` [PATCH 09/12] video: mxsfb: " Shawn Guo
2011-12-20 13:49 ` Marek Vasut
2011-12-21 2:11 ` Florian Tobias Schandinat
2011-12-20 12:00 ` [PATCH 10/12] ASoC: mxs-saif: " Shawn Guo
2011-12-20 11:55 ` Mark Brown
2011-12-20 13:49 ` Marek Vasut
2011-12-20 12:00 ` [PATCH 11/12] clk: add config option HAVE_CLK_PREPARE into Kconfig Shawn Guo
2011-12-20 12:00 ` [PATCH 12/12] arm/mxs: select HAVE_CLK_PREPARE for clock Shawn Guo
2011-12-20 13:43 ` [PATCH 0/12] Add clk_prepare/clk_unprepare for mxs clock api Marek Vasut
2011-12-20 14:05 ` Shawn Guo
2011-12-20 13:59 ` Marek Vasut
2011-12-20 14:21 ` Shawn Guo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201112201445.03521.marek.vasut@gmail.com \
--to=marek.vasut@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).