[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20221110184746.GA3084458@roeck-us.net>
Date: Thu, 10 Nov 2022 10:47:46 -0800
From: Guenter Roeck <linux@...ck-us.net>
To: Steven Rostedt <rostedt@...dmis.org>
Cc: linux-kernel@...r.kernel.org,
Linus Torvalds <torvalds@...ux-foundation.org>,
Thomas Gleixner <tglx@...utronix.de>,
Stephen Boyd <sboyd@...nel.org>,
Anna-Maria Gleixner <anna-maria@...utronix.de>,
Andrew Morton <akpm@...ux-foundation.org>,
Julia Lawall <Julia.Lawall@...ia.fr>,
Viresh Kumar <vireshk@...nel.org>,
Shiraz Hashim <shiraz.linux.kernel@...il.com>,
Russell King <linux@...linux.org.uk>, soc@...nel.org,
linux-arm-kernel@...ts.infradead.org,
Arnd Bergmann <arnd@...db.de>,
Viresh Kumar <viresh.kumar@...aro.org>
Subject: Re: [PATCH v6 1/6] ARM: spear: Do not use timer namespace for
timer_shutdown() function
On Thu, Nov 10, 2022 at 01:41:02AM -0500, Steven Rostedt wrote:
> From: "Steven Rostedt (Google)" <rostedt@...dmis.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 spear_timer_shutdown() to avoid this conflict.
>
> Link: https://lkml.kernel.org/r/20221106212701.822440504@goodmis.org
> Link: https://lore.kernel.org/all/20221105060155.228348078@goodmis.org/
Looks like those links are obsolete.
Guenter
>
> Cc: Viresh Kumar <vireshk@...nel.org>
> Cc: Linus Torvalds <torvalds@...ux-foundation.org>
> Cc: Thomas Gleixner <tglx@...utronix.de>
> Cc: Stephen Boyd <sboyd@...nel.org>
> Cc: Anna-Maria Gleixner <anna-maria@...utronix.de>
> Cc: Andrew Morton <akpm@...ux-foundation.org>
> Cc: Julia Lawall <Julia.Lawall@...ia.fr>
> Cc: Shiraz Hashim <shiraz.linux.kernel@...il.com>
> Cc: Russell King <linux@...linux.org.uk>
> Cc: soc@...nel.org
> Cc: linux-arm-kernel@...ts.infradead.org
> Acked-by: Arnd Bergmann <arnd@...db.de>
> Acked-by: Viresh Kumar <viresh.kumar@...aro.org>
> Reviewed-by: Guenter Roeck <linux@...ck-us.net>
> Tested-by: Guenter Roeck <linux@...ck-us.net>
> Signed-off-by: Steven Rostedt (Google) <rostedt@...dmis.org>
> ---
> 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.35.1
Powered by blists - more mailing lists