| Message ID | 20090507103139.31790.67489.sendpatchset@rx1.opensource.se (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
Hi Magnus. I saw this patch. I still think the init callback has to be called during the registration... And at the and this is what your are doing with this patch... Regards Francesco Magnus Damm ha scritto: > From: Magnus Damm <damm@igel.co.jp> > > Make sure that clk->ops->init() only gets called once in > the case of CLK_ALWAYS_ENABLED. Without this patch the > init() callback may be called multiple times. > > Signed-off-by: Magnus Damm <damm@igel.co.jp> > --- > > arch/sh/kernel/cpu/clock.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > --- 0001/arch/sh/kernel/cpu/clock.c > +++ work/arch/sh/kernel/cpu/clock.c 2009-05-07 15:00:52.000000000 +0900 > @@ -99,15 +99,18 @@ static int __clk_enable(struct clk *clk) > * changes and the clock needs to hunt for the proper set of > * divisors to use before it can effectively recalc. > */ > + > + if (clk->flags & CLK_ALWAYS_ENABLED) { > + kref_get(&clk->kref); > + return 0; > + } > + > if (unlikely(atomic_read(&clk->kref.refcount) == 1)) > if (clk->ops && clk->ops->init) > clk->ops->init(clk); > > kref_get(&clk->kref); > > - if (clk->flags & CLK_ALWAYS_ENABLED) > - return 0; > - > if (likely(clk->ops && clk->ops->enable)) > clk->ops->enable(clk); > > -- > To unsubscribe from this list: send the line "unsubscribe linux-sh" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > > -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
--- 0001/arch/sh/kernel/cpu/clock.c +++ work/arch/sh/kernel/cpu/clock.c 2009-05-07 15:00:52.000000000 +0900 @@ -99,15 +99,18 @@ static int __clk_enable(struct clk *clk) * changes and the clock needs to hunt for the proper set of * divisors to use before it can effectively recalc. */ + + if (clk->flags & CLK_ALWAYS_ENABLED) { + kref_get(&clk->kref); + return 0; + } + if (unlikely(atomic_read(&clk->kref.refcount) == 1)) if (clk->ops && clk->ops->init) clk->ops->init(clk); kref_get(&clk->kref); - if (clk->flags & CLK_ALWAYS_ENABLED) - return 0; - if (likely(clk->ops && clk->ops->enable)) clk->ops->enable(clk);