On Thu, Aug 18, 2016 at 07:34:26PM +0200, 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@xxxxxxxxxxxxxx>
Reviewed-by: Guenter Roeck <linux@xxxxxxxxxxxx>
> ---
> 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;
> }
> --
> 1.9.1
>
