Commit abde710c authored by Marc Zyngier's avatar Marc Zyngier

ARM: smp_twd: make local_timer_stop a symbol instead of a #define

When CONFIG_HAVE_ARM_TWD is selected, local_timer_stop is a #define,
while all other local timers are using a real function.

Convert it to an alias of twd_timer_stop, as it helps converting
all local timers to another internal API in a sane way.
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent a2821146
...@@ -26,17 +26,13 @@ void percpu_timer_setup(void); ...@@ -26,17 +26,13 @@ void percpu_timer_setup(void);
#include "smp_twd.h" #include "smp_twd.h"
#define local_timer_stop(c) twd_timer_stop((c)) #endif
#else
/* /*
* Stop the local timer * Stop the local timer
*/ */
void local_timer_stop(struct clock_event_device *); void local_timer_stop(struct clock_event_device *);
#endif
/* /*
* Setup a local timer interrupt for a CPU. * Setup a local timer interrupt for a CPU.
*/ */
......
...@@ -23,6 +23,5 @@ struct clock_event_device; ...@@ -23,6 +23,5 @@ struct clock_event_device;
extern void __iomem *twd_base; extern void __iomem *twd_base;
void twd_timer_setup(struct clock_event_device *); void twd_timer_setup(struct clock_event_device *);
void twd_timer_stop(struct clock_event_device *);
#endif #endif
...@@ -87,12 +87,17 @@ int twd_timer_ack(void) ...@@ -87,12 +87,17 @@ int twd_timer_ack(void)
return 0; return 0;
} }
void twd_timer_stop(struct clock_event_device *clk) static void twd_timer_stop(struct clock_event_device *clk)
{ {
twd_set_mode(CLOCK_EVT_MODE_UNUSED, clk); twd_set_mode(CLOCK_EVT_MODE_UNUSED, clk);
disable_percpu_irq(clk->irq); disable_percpu_irq(clk->irq);
} }
/* Temporary hack to be removed when all TWD users are converted to
the new registration interface */
void local_timer_stop(struct clock_event_device *clk)
__attribute__ ((alias ("twd_timer_stop")));
#ifdef CONFIG_CPU_FREQ #ifdef CONFIG_CPU_FREQ
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment