ARM: spear: Do not use timer namespace for timer_shutdown() function
Quoted 11 lines · Steven Rostedt
From: "Steven Rostedt (Google)" <[email protected]>
A new "shutdown" timer state is being added to the generic timer code. One of the functions to change the timer into the state is called "
timer_shutdown()". This means that there can not be other functions called "timer_shutdown()" as the timer code owns the "timer_*" name space.Rename
timer_shutdown()tospear_timer_shutdown()to avoid this conflict.
Looks like those links are obsolete.
Guenter
Quoted 63 lines
Cc Viresh Kumar <[email protected]>Cc Linus Torvalds <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Stephen Boyd <[email protected]>Cc Anna-Maria Gleixner <[email protected]>Cc Andrew Morton <[email protected]>Cc Julia Lawall <[email protected]>Cc Shiraz Hashim <[email protected]>Cc Russell King <[email protected]>Acked-by Arnd Bergmann <[email protected]>Acked-by Viresh Kumar <[email protected]>Reviewed-by Guenter Roeck <[email protected]>Tested-by Guenter Roeck <[email protected]>Signed-off-by Steven Rostedt (Google) <[email protected]>--- arch/arm/mach-spear/time.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)arch/arm/mach-spear/time.c +4
-4@@ -90,7 +90,7 @@ static void __init spear_clocksource_init(void) 200, 16, clocksource_mmio_readw_up); } -static inline void timer_shutdown (struct clock_event_device *evt) +static inline void spear_timer_shutdown (struct clock_event_device *evt) {u16 val =readw (gpt_base +CR (CLKEVT ));@@ -101,7 +101,7 @@ static inline void timer_shutdown(struct clock_event_device *evt)static int spear_shutdown (struct clock_event_device *evt) { -timer_shutdown (evt); +spear_timer_shutdown (evt);return 0 ; }@@ -111,7 +111,7 @@ static int spear_set_oneshot(struct clock_event_device *evt)u16 val;/* stop the timer */ -timer_shutdown (evt); +spear_timer_shutdown (evt); val =readw (gpt_base +CR (CLKEVT )); val |=CTRL_ONE_SHOT ;@@ -126,7 +126,7 @@ static int spear_set_periodic(struct clock_event_device *evt)u16 val;/* stop the timer */ -timer_shutdown (evt); +spear_timer_shutdown (evt); period =clk_get_rate (gpt_clk) /HZ ; period >>=CTRL_PRESCALER16 ;Signature · 1 line
2.35.1