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

ARM: spear: 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 spear_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>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarViresh 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
parent b0b0aa5d

arch/arm/mach-spear/time.c

+4 −4
Original line number Diff line number Diff line
@@ -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;