* [PATCH] watchdog: ath79_wdt: switch to clk_prepare/clk_disable
@ 2014-04-16 9:35 Gabor Juhos
2014-04-26 15:35 ` Guenter Roeck
2014-05-26 19:03 ` Wim Van Sebroeck
0 siblings, 2 replies; 3+ messages in thread
From: Gabor Juhos @ 2014-04-16 9:35 UTC (permalink / raw)
To: Wim Van Sebroeck; +Cc: linux-watchdog, Gabor Juhos
Replace clk_enable() and clk_disable() calls with
clk_prepare_enable() and clk_disable_unprepare()
to get ready for the migration to the common clock
framework.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
---
drivers/watchdog/ath79_wdt.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/watchdog/ath79_wdt.c b/drivers/watchdog/ath79_wdt.c
index 0e67d96..41ac466 100644
--- a/drivers/watchdog/ath79_wdt.c
+++ b/drivers/watchdog/ath79_wdt.c
@@ -265,7 +265,7 @@ static int ath79_wdt_probe(struct platform_device *pdev)
if (IS_ERR(wdt_clk))
return PTR_ERR(wdt_clk);
- err = clk_enable(wdt_clk);
+ err = clk_prepare_enable(wdt_clk);
if (err)
return err;
@@ -296,14 +296,14 @@ static int ath79_wdt_probe(struct platform_device *pdev)
return 0;
err_clk_disable:
- clk_disable(wdt_clk);
+ clk_disable_unprepare(wdt_clk);
return err;
}
static int ath79_wdt_remove(struct platform_device *pdev)
{
misc_deregister(&ath79_wdt_miscdev);
- clk_disable(wdt_clk);
+ clk_disable_unprepare(wdt_clk);
return 0;
}
--
1.7.10
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] watchdog: ath79_wdt: switch to clk_prepare/clk_disable
2014-04-16 9:35 [PATCH] watchdog: ath79_wdt: switch to clk_prepare/clk_disable Gabor Juhos
@ 2014-04-26 15:35 ` Guenter Roeck
2014-05-26 19:03 ` Wim Van Sebroeck
1 sibling, 0 replies; 3+ messages in thread
From: Guenter Roeck @ 2014-04-26 15:35 UTC (permalink / raw)
To: Gabor Juhos, Wim Van Sebroeck; +Cc: linux-watchdog
On 04/16/2014 02:35 AM, Gabor Juhos wrote:
> Replace clk_enable() and clk_disable() calls with
> clk_prepare_enable() and clk_disable_unprepare()
> to get ready for the migration to the common clock
> framework.
>
> Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] watchdog: ath79_wdt: switch to clk_prepare/clk_disable
2014-04-16 9:35 [PATCH] watchdog: ath79_wdt: switch to clk_prepare/clk_disable Gabor Juhos
2014-04-26 15:35 ` Guenter Roeck
@ 2014-05-26 19:03 ` Wim Van Sebroeck
1 sibling, 0 replies; 3+ messages in thread
From: Wim Van Sebroeck @ 2014-05-26 19:03 UTC (permalink / raw)
To: Gabor Juhos; +Cc: linux-watchdog
Hi Gabor,
> Replace clk_enable() and clk_disable() calls with
> clk_prepare_enable() and clk_disable_unprepare()
> to get ready for the migration to the common clock
> framework.
>
> Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
> ---
> drivers/watchdog/ath79_wdt.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/watchdog/ath79_wdt.c b/drivers/watchdog/ath79_wdt.c
> index 0e67d96..41ac466 100644
> --- a/drivers/watchdog/ath79_wdt.c
> +++ b/drivers/watchdog/ath79_wdt.c
> @@ -265,7 +265,7 @@ static int ath79_wdt_probe(struct platform_device *pdev)
> if (IS_ERR(wdt_clk))
> return PTR_ERR(wdt_clk);
>
> - err = clk_enable(wdt_clk);
> + err = clk_prepare_enable(wdt_clk);
> if (err)
> return err;
>
> @@ -296,14 +296,14 @@ static int ath79_wdt_probe(struct platform_device *pdev)
> return 0;
>
> err_clk_disable:
> - clk_disable(wdt_clk);
> + clk_disable_unprepare(wdt_clk);
> return err;
> }
>
> static int ath79_wdt_remove(struct platform_device *pdev)
> {
> misc_deregister(&ath79_wdt_miscdev);
> - clk_disable(wdt_clk);
> + clk_disable_unprepare(wdt_clk);
> return 0;
> }
>
This patch has been added to linux-watchdog-next.
Kind regards,
Wim.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-05-26 19:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-04-16 9:35 [PATCH] watchdog: ath79_wdt: switch to clk_prepare/clk_disable Gabor Juhos
2014-04-26 15:35 ` Guenter Roeck
2014-05-26 19:03 ` Wim Van Sebroeck
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.