[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <55427D25.3040904@codeaurora.org>
Date: Thu, 30 Apr 2015 12:06:13 -0700
From: Stephen Boyd <sboyd@...eaurora.org>
To: Dong Aisheng <aisheng.dong@...escale.com>,
linux-clk@...r.kernel.org
CC: linux-kernel@...r.kernel.org, mturquette@...aro.org,
shawn.guo@...aro.org, b29396@...escale.com,
linux-arm-kernel@...ts.infradead.org,
Ranjani.Vaidyanathan@...escale.com, b20596@...escale.com,
r64343@...escale.com, b20788@...escale.com
Subject: Re: [PATCH RFC v1 1/5] clk: change clk_core name of __clk_set_parent_after
On 04/15/15 07:26, Dong Aisheng wrote:
> To align with __clk_set_parent_before and some others functions,
> change the host clk name to 'clk' instead of 'core'.
>
> Cc: Mike Turquette <mturquette@...aro.org>
> Cc: Stephen Boyd <sboyd@...eaurora.org>
> Signed-off-by: Dong Aisheng <aisheng.dong@...escale.com>
> ---
No thanks. We should go and rename all clk_core pointers in this file
from clk to core now that we're done splitting the two. I'll go do that now.
> drivers/clk/clk.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
> index 459ce9d..cc56ba2 100644
> --- a/drivers/clk/clk.c
> +++ b/drivers/clk/clk.c
> @@ -1487,7 +1487,7 @@ static struct clk_core *__clk_set_parent_before(struct clk_core *clk,
> return old_parent;
> }
>
> -static void __clk_set_parent_after(struct clk_core *core,
> +static void __clk_set_parent_after(struct clk_core *clk,
> struct clk_core *parent,
> struct clk_core *old_parent)
> {
> @@ -1495,8 +1495,8 @@ static void __clk_set_parent_after(struct clk_core *core,
> * Finish the migration of prepare state and undo the changes done
> * for preventing a race with clk_enable().
> */
> - if (core->prepare_count) {
> - clk_core_disable(core);
> + if (clk->prepare_count) {
> + clk_core_disable(clk);
> clk_core_disable(old_parent);
> clk_core_unprepare(old_parent);
> }
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists