Commit 3e0e7195 authored Aug 11, 2023 by Steven Rostedt (Google) Committed by Yu Liao Aug 11, 2023

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

mainline inclusion
from mainline-v6.2-rc1
commit 6e1fc259
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I7R8WG

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=6e1fc2591f116dfb20b65cf27356475461d61bd8



--------------------------------

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



Signed-off-by: Yu Liao <liaoyu15@huawei.com>

parent 2ebfa836

drivers/clocksource/timer-sp804.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -170,14 +170,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;
		}

		@@ -186,7 +186,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;