Message ID | 3039627.dHjlxm4JCV@wuerfel (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Tue, Jun 04, 2013 at 12:03:38AM +0200, 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> > Cc: Gregory CLEMENT <gregory.clement@free-electrons.com> > Cc: Jason Cooper <jason@lakedaemon.net> > --- > > Please apply for 3.11 Acked-by: Jason Cooper <jason@lakedaemon.net> thx, Jason.
On 06/04, 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> > Cc: Gregory CLEMENT <gregory.clement@free-electrons.com> > Cc: Jason Cooper <jason@lakedaemon.net> > --- > > Please apply for 3.11 > This will conflict slightly with my series[1]. If this is targeted for 3.11 it may be better to just drop this patch and let my series remove the ops structure entirely. [1] https://lkml.org/lkml/2013/6/3/583
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 } }
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> Cc: Gregory CLEMENT <gregory.clement@free-electrons.com> Cc: Jason Cooper <jason@lakedaemon.net> --- Please apply for 3.11