| Message ID | 20221105060155.228348078@goodmis.org (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | None | expand |
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
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>
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>
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;