Skip to contentSkip to conversation

clocksource: armada-xp: always register local_timer_ops

PATCH New Arnd Bergmann 3 participants 3 messages Jun 3, 2013 – Jun 4, 2013 Clocksource, clockevent drivers

lore
Share & tools
lore

Arnd Bergmann

author
#0 lore raw

PATCH 1/1 clocksource: armada-xp: always register local_timer_ops

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 <[email protected]>
Cc Gregory CLEMENT <[email protected]>
Cc Jason Cooper <[email protected]>

---

Please apply for 3.11

drivers/clocksource/time-armada-370-xp.c +0 -2
index 47a6730..4cd8520 100644
@@ -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
 	}
 }
#1 lore raw

PATCH 1/1 clocksource: armada-xp: always register local_timer_ops

Quoted 11 lines · Arnd Bergmann

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.

Quoted 6 lines
Signed-off-by Arnd Bergmann <[email protected]>
Cc Gregory CLEMENT <[email protected]>
Cc Jason Cooper <[email protected]>

---

Please apply for 3.11

Acked-by Jason Cooper <[email protected]>

thx,

Jason.

#2 lore raw

PATCH 1/1 clocksource: armada-xp: always register local_timer_ops

In reply to Arnd Bergmann
Quoted 11 lines · Arnd Bergmann

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.

Quoted 7 lines
Signed-off-by Arnd Bergmann <[email protected]>
Cc Gregory CLEMENT <[email protected]>
Cc Jason Cooper <[email protected]>

---

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

Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation