Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-09-20 15:03:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Steven Rostedt (Google) 2022-11-23 21:18:36 +01:00 committed by Thomas Gleixner
parent 73737a5833
commit 6e1fc2591f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/clocksource/timer-sp804.c
View File

@ -155,14 +155,14 @@ static irqreturn_t sp804_timer_interrupt(int irq, void *dev_id)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static inline void timer_shutdown(struct clock_event_device *evt) static inline void evt_timer_shutdown(struct clock_event_device *evt)
{ {
writel(0, common_clkevt->ctrl); writel(0, common_clkevt->ctrl);
} }
static int sp804_shutdown(struct clock_event_device *evt) static int sp804_shutdown(struct clock_event_device *evt)
{ {
timer_shutdown(evt); evt_timer_shutdown(evt);
return 0; return 0;
} }
@ -171,7 +171,7 @@ static int sp804_set_periodic(struct clock_event_device *evt)
unsigned long ctrl = TIMER_CTRL_32BIT | TIMER_CTRL_IE | unsigned long ctrl = TIMER_CTRL_32BIT | TIMER_CTRL_IE |
TIMER_CTRL_PERIODIC | TIMER_CTRL_ENABLE; TIMER_CTRL_PERIODIC | TIMER_CTRL_ENABLE;
timer_shutdown(evt); evt_timer_shutdown(evt);
writel(common_clkevt->reload, common_clkevt->load); writel(common_clkevt->reload, common_clkevt->load);
writel(ctrl, common_clkevt->ctrl); writel(ctrl, common_clkevt->ctrl);
return 0; return 0;