Re: [PATCH v4a 04/38] clocksource/drivers/sp804: Do not use timer namespace for timer_shutdown() function

Guenter Roeck
2022-11-05T14:06:27Z

On Sat, Nov 05, 2022 at 02:00:28AM -0400, Steven Rostedt wrote:
> From: "Steven Rostedt (Google)" <rostedt@goodmis.org>
>
> 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.
>
> Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

> ---
> drivers/clocksource/timer-sp804.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/clocksource/timer-sp804.c b/drivers/clocksource/timer-sp804.c
> index e6a87f4af2b5..cd1916c05325 100644
> --- a/drivers/clocksource/timer-sp804.c
> +++ b/drivers/clocksource/timer-sp804.c
> @@ -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;
> --
> 2.35.1