From mboxrd@z Thu Jan 1 00:00:00 1970 From: sboyd@codeaurora.org (Stephen Boyd) Date: Thu, 30 Apr 2015 12:06:13 -0700 Subject: [PATCH RFC v1 1/5] clk: change clk_core name of __clk_set_parent_after In-Reply-To: <1429107999-24413-2-git-send-email-aisheng.dong@freescale.com> References: <1429107999-24413-1-git-send-email-aisheng.dong@freescale.com> <1429107999-24413-2-git-send-email-aisheng.dong@freescale.com> Message-ID: <55427D25.3040904@codeaurora.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 > Cc: Stephen Boyd > Signed-off-by: Dong Aisheng > --- 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