Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

clocksource/drivers/sp804: Do not use timer namespace for timer_shutdown() function

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() to evt_timer_shutdown() to avoid this conflict.

Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Reviewed-by: Anna-Maria Behnsen <anna-maria@linutronix.de>
Link: https://lkml.kernel.org/r/20221106212702.182883323@goodmis.org
Link: https://lore.kernel.org/all/20221105060155.592778858@goodmis.org/
Link: https://lore.kernel.org/r/20221110064147.158230501@goodmis.org
Link: https://lore.kernel.org/r/20221123201624.634354813@linutronix.de



authored by

Steven Rostedt (Google) and committed by
Thomas Gleixner
6e1fc259 73737a58

+3 -3
+3 -3
drivers/clocksource/timer-sp804.c
··· 155 155 return IRQ_HANDLED; 156 156 } 157 157 158 - static inline void timer_shutdown(struct clock_event_device *evt) 158 + static inline void evt_timer_shutdown(struct clock_event_device *evt) 159 159 { 160 160 writel(0, common_clkevt->ctrl); 161 161 } 162 162 163 163 static int sp804_shutdown(struct clock_event_device *evt) 164 164 { 165 - timer_shutdown(evt); 165 + evt_timer_shutdown(evt); 166 166 return 0; 167 167 } 168 168 ··· 171 171 unsigned long ctrl = TIMER_CTRL_32BIT | TIMER_CTRL_IE | 172 172 TIMER_CTRL_PERIODIC | TIMER_CTRL_ENABLE; 173 173 174 - timer_shutdown(evt); 174 + evt_timer_shutdown(evt); 175 175 writel(common_clkevt->reload, common_clkevt->load); 176 176 writel(ctrl, common_clkevt->ctrl); 177 177 return 0;