* [PATCH v4a 02/38] ARM: spear: Do not use timer namespace for timer_shutdown() function [not found] <20221105060024.598488967@goodmis.org> @ 2022-11-05 6:00 ` Steven Rostedt 2022-11-05 14:05 ` Guenter Roeck 2022-11-05 18:12 ` Arnd Bergmann 0 siblings, 2 replies; 4+ messages in thread From: Steven Rostedt @ 2022-11-05 6:00 UTC (permalink / raw) To: linux-kernel Cc: Linus Torvalds, Thomas Gleixner, Stephen Boyd, Guenter Roeck, Anna-Maria Gleixner, Andrew Morton, Viresh Kumar, Shiraz Hashim, Russell King, soc, linux-arm-kernel 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: Viresh Kumar <vireshk@kernel.org> Cc: Shiraz Hashim <shiraz.linux.kernel@gmail.com> Cc: Russell King <linux@armlinux.org.uk> Cc: soc@kernel.org Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.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..9629b8fae85f 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 evt_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); + evt_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); + evt_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); + evt_timer_shutdown(evt); period = clk_get_rate(gpt_clk) / HZ; period >>= CTRL_PRESCALER16; -- 2.35.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v4a 02/38] ARM: spear: Do not use timer namespace for timer_shutdown() function 2022-11-05 6:00 ` [PATCH v4a 02/38] ARM: spear: Do not use timer namespace for timer_shutdown() function Steven Rostedt @ 2022-11-05 14:05 ` Guenter Roeck 2022-11-07 5:46 ` Viresh Kumar 2022-11-05 18:12 ` Arnd Bergmann 1 sibling, 1 reply; 4+ messages in thread From: Guenter Roeck @ 2022-11-05 14:05 UTC (permalink / raw) To: Steven Rostedt Cc: linux-kernel, Linus Torvalds, Thomas Gleixner, Stephen Boyd, Anna-Maria Gleixner, Andrew Morton, Viresh Kumar, Shiraz Hashim, Russell King, soc, linux-arm-kernel On Sat, Nov 05, 2022 at 02:00:26AM -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: Viresh Kumar <vireshk@kernel.org> > Cc: Shiraz Hashim <shiraz.linux.kernel@gmail.com> > Cc: Russell King <linux@armlinux.org.uk> > Cc: soc@kernel.org > Cc: linux-arm-kernel@lists.infradead.org > Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org> Nitpick: I would have called it spear_timer_shutdown(). POV, so Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > 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..9629b8fae85f 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 evt_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); > + evt_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); > + evt_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); > + evt_timer_shutdown(evt); > > period = clk_get_rate(gpt_clk) / HZ; > period >>= CTRL_PRESCALER16; > -- > 2.35.1 ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v4a 02/38] ARM: spear: Do not use timer namespace for timer_shutdown() function 2022-11-05 14:05 ` Guenter Roeck @ 2022-11-07 5:46 ` Viresh Kumar 0 siblings, 0 replies; 4+ messages in thread From: Viresh Kumar @ 2022-11-07 5:46 UTC (permalink / raw) To: Guenter Roeck Cc: Steven Rostedt, linux-kernel, Linus Torvalds, Thomas Gleixner, Stephen Boyd, Anna-Maria Gleixner, Andrew Morton, Viresh Kumar, Shiraz Hashim, Russell King, soc, linux-arm-kernel On 05-11-22, 07:05, Guenter Roeck wrote: > On Sat, Nov 05, 2022 at 02:00:26AM -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: Viresh Kumar <vireshk@kernel.org> > > Cc: Shiraz Hashim <shiraz.linux.kernel@gmail.com> > > Cc: Russell King <linux@armlinux.org.uk> > > Cc: soc@kernel.org > > Cc: linux-arm-kernel@lists.infradead.org > > Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org> > > Nitpick: I would have called it spear_timer_shutdown(). POV, so +1 Other than that: Acked-by: Viresh Kumar <viresh.kumar@linaro.org> -- viresh ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v4a 02/38] ARM: spear: Do not use timer namespace for timer_shutdown() function 2022-11-05 6:00 ` [PATCH v4a 02/38] ARM: spear: Do not use timer namespace for timer_shutdown() function Steven Rostedt 2022-11-05 14:05 ` Guenter Roeck @ 2022-11-05 18:12 ` Arnd Bergmann 1 sibling, 0 replies; 4+ messages in thread From: Arnd Bergmann @ 2022-11-05 18:12 UTC (permalink / raw) To: Steven Rostedt, linux-kernel Cc: Linus Torvalds, Thomas Gleixner, Stephen Boyd, Guenter Roeck, Anna-Maria Gleixner, Andrew Morton, Viresh Kumar, Shiraz Hashim, Russell King, soc, linux-arm-kernel On Sat, Nov 5, 2022, at 07:00, 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: Viresh Kumar <vireshk@kernel.org> > Cc: Shiraz Hashim <shiraz.linux.kernel@gmail.com> > Cc: Russell King <linux@armlinux.org.uk> > Cc: soc@kernel.org > Cc: linux-arm-kernel@lists.infradead.org > Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org> For arch/arm/mach-* Acked-by: Arnd Bergmann <arnd@arndb.de> ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-11-07 5:46 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20221105060024.598488967@goodmis.org>
2022-11-05 6:00 ` [PATCH v4a 02/38] ARM: spear: Do not use timer namespace for timer_shutdown() function Steven Rostedt
2022-11-05 14:05 ` Guenter Roeck
2022-11-07 5:46 ` Viresh Kumar
2022-11-05 18:12 ` Arnd Bergmann
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox