From 80b55772d41d8afec68dbc4ff0368a9fe5d1f390 Mon Sep 17 00:00:00 2001

From: "Steven Rostedt (Google)" <rostedt@goodmis.org>

Date: Wed, 23 Nov 2022 21:18:32 +0100

Subject: [PATCH] ARM: spear: Do not use timer namespace for timer_shutdown()

 function

Git-commit: 80b55772d41d8afec68dbc4ff0368a9fe5d1f390

References: bsc#1207210

Patch-mainline: v6.2-rc1

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 spear_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>

Acked-by: Arnd Bergmann <arnd@arndb.de>

Acked-by: Viresh Kumar <viresh.kumar@linaro.org>

Link: https://lkml.kernel.org/r/20221106212701.822440504@goodmis.org

Link: https://lore.kernel.org/all/20221105060155.228348078@goodmis.org/

Link: https://lore.kernel.org/r/20221110064146.810953418@goodmis.org

Link: https://lore.kernel.org/r/20221123201624.513863211@linutronix.de

Signed-off-by: Oliver Neukum <oneukum@suse.com>

---

 arch/arm/mach-spear/time.c | 8 ++++----

 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-spear/time.c b/arch/arm/mach-spear/time.c

index e979e2197f8e..5371c824786d 100644

--- a/arch/arm/mach-spear/time.c

+++ b/arch/arm/mach-spear/time.c

@@ -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;

-- 

2.39.0