| Message ID | 1471541667-30689-3-git-send-email-geert@linux-m68k.org (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On 08/18/2016 10:34 AM, Geert Uytterhoeven wrote: > While the custom minimal TXx9 clock implementation doesn't need or use > clock (un)prepare calls (they are dummies if !CONFIG_HAVE_CLK_PREPARE), > they are mandatory when using the Common Clock Framework. > > Hence add them, to prepare for the advent of CCF. > > Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > Tested on RBTX4927. > --- > drivers/watchdog/txx9wdt.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/watchdog/txx9wdt.c b/drivers/watchdog/txx9wdt.c > index c2da880292bc2f32..6f7a9deb27d05d25 100644 > --- a/drivers/watchdog/txx9wdt.c > +++ b/drivers/watchdog/txx9wdt.c > @@ -112,7 +112,7 @@ static int __init txx9wdt_probe(struct platform_device *dev) > txx9_imclk = NULL; > goto exit; > } > - ret = clk_enable(txx9_imclk); > + ret = clk_prepare_enable(txx9_imclk); > if (ret) { > clk_put(txx9_imclk); > txx9_imclk = NULL; > @@ -144,7 +144,7 @@ static int __init txx9wdt_probe(struct platform_device *dev) > return 0; > exit: > if (txx9_imclk) { > - clk_disable(txx9_imclk); > + clk_disable_unprepare(txx9_imclk); > clk_put(txx9_imclk); > } > return ret; > @@ -153,7 +153,7 @@ exit: > static int __exit txx9wdt_remove(struct platform_device *dev) > { > watchdog_unregister_device(&txx9wdt); > - clk_disable(txx9_imclk); > + clk_disable_unprepare(txx9_imclk); > clk_put(txx9_imclk); > return 0; > } > -- To unsubscribe from this list: send the line "unsubscribe linux-clk" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/watchdog/txx9wdt.c b/drivers/watchdog/txx9wdt.c index c2da880292bc2f32..6f7a9deb27d05d25 100644 --- a/drivers/watchdog/txx9wdt.c +++ b/drivers/watchdog/txx9wdt.c @@ -112,7 +112,7 @@ static int __init txx9wdt_probe(struct platform_device *dev) txx9_imclk = NULL; goto exit; } - ret = clk_enable(txx9_imclk); + ret = clk_prepare_enable(txx9_imclk); if (ret) { clk_put(txx9_imclk); txx9_imclk = NULL; @@ -144,7 +144,7 @@ static int __init txx9wdt_probe(struct platform_device *dev) return 0; exit: if (txx9_imclk) { - clk_disable(txx9_imclk); + clk_disable_unprepare(txx9_imclk); clk_put(txx9_imclk); } return ret; @@ -153,7 +153,7 @@ exit: static int __exit txx9wdt_remove(struct platform_device *dev) { watchdog_unregister_device(&txx9wdt); - clk_disable(txx9_imclk); + clk_disable_unprepare(txx9_imclk); clk_put(txx9_imclk); return 0; }
While the custom minimal TXx9 clock implementation doesn't need or use clock (un)prepare calls (they are dummies if !CONFIG_HAVE_CLK_PREPARE), they are mandatory when using the Common Clock Framework. Hence add them, to prepare for the advent of CCF. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> --- Tested on RBTX4927. --- drivers/watchdog/txx9wdt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)