Subject: [PATCH 01/12] clk: add helper functions clk_prepare_enable and clk_disable_unprepare

From: [email-masked] (Marek Vasut)
Date: Tue, 20 Dec 2011 14:48:10 +0100

> From: Richard Zhao <[email-masked]>
> 
> It's for migrating to generic clk framework API.
> 
> The helper functions  help cases clk_enable/clk_disable is used
> in non-atomic context.
> For example, Call clk_enable in probe and clk_disable in remove.
> 
> Signed-off-by: Richard Zhao <[email-masked]>
> Signed-off-by: Sascha Hauer <[email-masked]>
> Signed-off-by: Shawn Guo <[email-masked]>
> Cc: Russell King <[email-masked]>
> ---
>  include/linux/clk.h |   22 ++++++++++++++++++++++
>  1 files changed, 22 insertions(+), 0 deletions(-)
> 
> diff --git a/include/linux/clk.h b/include/linux/clk.h
> index 7213b52..b9d46fa 100644
> --- a/include/linux/clk.h
> +++ b/include/linux/clk.h
> @@ -107,6 +107,28 @@ static inline void clk_unprepare(struct clk *clk)
>  }
>  #endif
> 
> +/* clk_prepare_enable helps cases using clk_enable in non-atomic context.
> */ +static inline int clk_prepare_enable(struct clk *clk)
> +{
> +	int ret;
> +
> +	ret = clk_prepare(clk);
> +	if (ret)
> +		return ret;
> +	ret = clk_enable(clk);
> +	if (ret)
> +		clk_unprepare(clk);
> +
> +	return ret;
> +}
> +
> +/* clk_disable_unprepare helps cases using clk_disable in non-atomic
> context. */ +static inline void clk_disable_unprepare(struct clk *clk)
> +{
> +	clk_disable(clk);
> +	clk_unprepare(clk);
> +}
> +
>  /**
>   * clk_get_rate - obtain the current clock rate (in Hz) for a clock
> source. *		  This is only valid once the clock source has been 
enabled.

Just be sure clk_prepare() is always available (which I suspect is checked in 
the implementation, so ok). Other than that, 

Acked-by: Marek Vasut <[email-masked]>