Commit 6e1fc259 authored by Steven Rostedt (Google)'s avatar Steven Rostedt (Google) Committed by Thomas Gleixner
Browse files

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: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Tested-by: default avatarGuenter Roeck <linux@roeck-us.net>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Reviewed-by: default avatarAnna-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
parent 73737a58

drivers/clocksource/timer-sp804.c

+3 −3
Original line number Diff line number Diff line
@@ -155,14 +155,14 @@ static irqreturn_t sp804_timer_interrupt(int irq, void *dev_id) 
	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);

}



static int sp804_shutdown(struct clock_event_device *evt)

{

	timer_shutdown(evt);

	evt_timer_shutdown(evt);

	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 |

			     TIMER_CTRL_PERIODIC | TIMER_CTRL_ENABLE;



	timer_shutdown(evt);

	evt_timer_shutdown(evt);

	writel(common_clkevt->reload, common_clkevt->load);

	writel(ctrl, common_clkevt->ctrl);

	return 0;