On Thu, Apr 30, 2015 at 12:06:13PM -0700, Stephen Boyd wrote:
> 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 <[email protected]>
> > Cc: Stephen Boyd <[email protected]>
> > Signed-off-by: Dong Aisheng <[email protected]>
> > ---
>
> 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.
>
Understand.
Thanks for this information.
Regards
Dong Aisheng
> > 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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
