Re: [PATCH] wdt:clk: preparation for switch to common clock framework

[Mike Turquette <mturquette@linaro.org>]

Quoting Murali Karicheri (2012-08-30 11:29:10)
> As a first step towards migrating davinci platforms to use common clock
> framework, replace all instances of clk_enable() with clk_prepare_enable()
> and clk_disable() with clk_disable_unprepare(). Until the platform is
> switched to use the CONFIG_HAVE_CLK_PREPARE Kconfig variable, this just
> adds a might_sleep() call and would work without any issues.
> 
> This will make it easy later to switch to common clk based implementation
> of clk driver from DaVinci specific driver.
> 
> Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>

Acked-by: Mike Turquette <mturquette@linaro.org>

> ---
>  drivers/watchdog/davinci_wdt.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
> index c8c5c80..eb44b03 100644
> --- a/drivers/watchdog/davinci_wdt.c
> +++ b/drivers/watchdog/davinci_wdt.c
> @@ -208,7 +208,7 @@ static int __devinit davinci_wdt_probe(struct platform_device *pdev)
>         if (WARN_ON(IS_ERR(wdt_clk)))
>                 return PTR_ERR(wdt_clk);
>  
> -       clk_enable(wdt_clk);
> +       clk_prepare_enable(wdt_clk);
>  
>         if (heartbeat < 1 || heartbeat > MAX_HEARTBEAT)
>                 heartbeat = DEFAULT_HEARTBEAT;
> @@ -256,7 +256,7 @@ static int __devexit davinci_wdt_remove(struct platform_device *pdev)
>                 wdt_mem = NULL;
>         }
>  
> -       clk_disable(wdt_clk);
> +       clk_disable_unprepare(wdt_clk);
>         clk_put(wdt_clk);
>  
>         return 0;
> -- 
> 1.7.9.5