Re: [PATCH 1/8] clocksource: armada-xp: always register local_timer_ops

[Stephen Boyd <sboyd@codeaurora.org>]

On 07/05, Gregory CLEMENT wrote:
> On 07/05/2013 06:23 PM, Arnd Bergmann wrote:
> > The call to local_timer_register is hidden behind an #ifdef, which
> > turns the armada_370_xp_local_timer_ops into a potentially unused
> > variable, causing this warning:
> > 
> > time-armada-370-xp.c:208:31: warning: 'armada_370_xp_local_timer_ops' defined but not used [-Wunused-variable]
> >  static struct local_timer_ops armada_370_xp_local_timer_ops __cpuinitdata = {
> >                                ^
> > 
> > Since local_timer_register() itself doesn't do anything, just removing
> > the #ifdef makes the code look nicer and gets rid of the warning.
> > 
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > Acked-by: Jason Cooper <jason@lakedaemon.net>
> > Cc: Gregory CLEMENT <gregory.clement@free-electrons.com>
> > ---
> >  drivers/clocksource/time-armada-370-xp.c | 2 --
> >  1 file changed, 2 deletions(-)
> > 
> > diff --git a/drivers/clocksource/time-armada-370-xp.c b/drivers/clocksource/time-armada-370-xp.c
> > index 47a6730..4cd8520 100644
> > --- a/drivers/clocksource/time-armada-370-xp.c
> > +++ b/drivers/clocksource/time-armada-370-xp.c
> > @@ -294,8 +294,6 @@ void __init armada_370_xp_timer_init(void)
> >  				percpu_armada_370_xp_evt);
> >  	if (!res) {
> >  		enable_percpu_irq(armada_370_xp_clkevt.irq, 0);
> > -#ifdef CONFIG_LOCAL_TIMERS
> >  		local_timer_register(&armada_370_xp_local_timer_ops);
> > -#endif
> >  	}
> >  }
> > 
> 
> I thought this issue was kind of fixed by the patch
> "clocksource: time-armada-370-xp: Divorce from local timer API" from Stephen Boyd.
> 
> But I can't find it in linux-next so maybe it has not been pulled, so in this case
> you can also add my
> Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
> 

The pull request is blocked on Thomas responding about
timers/core being a stable branch. We may just have to wait until
timers/core goes in before Arnd and Olof can take it in.

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation