[PATCH 2/2] clk: Convert __clk_get_name(hw->clk) to clk_hw_get_name(hw)

Sebastian Hesselbarth sebastian.hesselbarth at gmail.com
Thu Aug 13 01:56:31 PDT 2015


On 08/13/2015 01:12 AM, Stephen Boyd wrote:
> Use the provider based method to get a clock's name so that we
> can get rid of the clk member in struct clk_hw one day. Mostly
> converted with the following coccinelle script.
>
> @@
> struct clk_hw *E;
> @@
>
> -__clk_get_name(E->clk)
> +clk_hw_get_name(E)
[...]
> Signed-off-by: Stephen Boyd <sboyd at codeaurora.org>
> ---
>   drivers/clk/berlin/berlin2-pll.c     |  4 ++--

For Berlin,

Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth at gmail.com>

Thanks!

[...]
> diff --git a/drivers/clk/berlin/berlin2-pll.c b/drivers/clk/berlin/berlin2-pll.c
> index f4b8d324b083..1c2294d3ba85 100644
> --- a/drivers/clk/berlin/berlin2-pll.c
> +++ b/drivers/clk/berlin/berlin2-pll.c
> @@ -61,7 +61,7 @@ berlin2_pll_recalc_rate(struct clk_hw *hw, unsigned long parent_rate)
>   	fbdiv = (val >> map->fbdiv_shift) & FBDIV_MASK;
>   	rfdiv = (val >> map->rfdiv_shift) & RFDIV_MASK;
>   	if (rfdiv == 0) {
> -		pr_warn("%s has zero rfdiv\n", __clk_get_name(hw->clk));
> +		pr_warn("%s has zero rfdiv\n", clk_hw_get_name(hw));
>   		rfdiv = 1;
>   	}
>
> @@ -70,7 +70,7 @@ berlin2_pll_recalc_rate(struct clk_hw *hw, unsigned long parent_rate)
>   	vcodiv = map->vcodiv[vcodivsel];
>   	if (vcodiv == 0) {
>   		pr_warn("%s has zero vcodiv (index %d)\n",
> -			__clk_get_name(hw->clk), vcodivsel);
> +			clk_hw_get_name(hw), vcodivsel);
>   		vcodiv = 1;
>   	}




More information about the Linux-rockchip mailing list