| Message ID | 20221106054648.549609750@goodmis.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v5a,1/5] ARM: spear: Do not use timer namespace for timer_shutdown() function | expand |
On Sun, 06 Nov 2022 05:45:37 +0000, Steven Rostedt <rostedt@goodmis.org> 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 arch_timer_shutdown() to avoid this conflict. > > Link: https://lore.kernel.org/all/20221105060155.409832154@goodmis.org/ > > Cc: Mark Rutland <mark.rutland@arm.com> > Cc: Marc Zyngier <maz@kernel.org> > Cc: Daniel Lezcano <daniel.lezcano@linaro.org> > Cc: Thomas Gleixner <tglx@linutronix.de> > Cc: linux-arm-kernel@lists.infradead.org > Reviewed-by: Guenter Roeck <linux@roeck-us.net> > Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org> Acked-by: Marc Zyngier <maz@kernel.org> M.
On Sun, Nov 06, 2022 at 01:45:37AM -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 arch_timer_shutdown() to avoid this conflict. > > Link: https://lore.kernel.org/all/20221105060155.409832154@goodmis.org/ > > Cc: Mark Rutland <mark.rutland@arm.com> > Cc: Marc Zyngier <maz@kernel.org> > Cc: Daniel Lezcano <daniel.lezcano@linaro.org> > Cc: Thomas Gleixner <tglx@linutronix.de> > Cc: linux-arm-kernel@lists.infradead.org > Reviewed-by: Guenter Roeck <linux@roeck-us.net> > Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org> Acked-by: Mark Rutland <mark.rutland@arm.com> Mark. > --- > drivers/clocksource/arm_arch_timer.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c > index a7ff77550e17..9c3420a0d19d 100644 > --- a/drivers/clocksource/arm_arch_timer.c > +++ b/drivers/clocksource/arm_arch_timer.c > @@ -687,8 +687,8 @@ static irqreturn_t arch_timer_handler_virt_mem(int irq, void *dev_id) > return timer_handler(ARCH_TIMER_MEM_VIRT_ACCESS, evt); > } > > -static __always_inline int timer_shutdown(const int access, > - struct clock_event_device *clk) > +static __always_inline int arch_timer_shutdown(const int access, > + struct clock_event_device *clk) > { > unsigned long ctrl; > > @@ -701,22 +701,22 @@ static __always_inline int timer_shutdown(const int access, > > static int arch_timer_shutdown_virt(struct clock_event_device *clk) > { > - return timer_shutdown(ARCH_TIMER_VIRT_ACCESS, clk); > + return arch_timer_shutdown(ARCH_TIMER_VIRT_ACCESS, clk); > } > > static int arch_timer_shutdown_phys(struct clock_event_device *clk) > { > - return timer_shutdown(ARCH_TIMER_PHYS_ACCESS, clk); > + return arch_timer_shutdown(ARCH_TIMER_PHYS_ACCESS, clk); > } > > static int arch_timer_shutdown_virt_mem(struct clock_event_device *clk) > { > - return timer_shutdown(ARCH_TIMER_MEM_VIRT_ACCESS, clk); > + return arch_timer_shutdown(ARCH_TIMER_MEM_VIRT_ACCESS, clk); > } > > static int arch_timer_shutdown_phys_mem(struct clock_event_device *clk) > { > - return timer_shutdown(ARCH_TIMER_MEM_PHYS_ACCESS, clk); > + return arch_timer_shutdown(ARCH_TIMER_MEM_PHYS_ACCESS, clk); > } > > static __always_inline void set_next_event(const int access, unsigned long evt, > -- > 2.35.1
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index a7ff77550e17..9c3420a0d19d 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -687,8 +687,8 @@ static irqreturn_t arch_timer_handler_virt_mem(int irq, void *dev_id) return timer_handler(ARCH_TIMER_MEM_VIRT_ACCESS, evt); } -static __always_inline int timer_shutdown(const int access, - struct clock_event_device *clk) +static __always_inline int arch_timer_shutdown(const int access, + struct clock_event_device *clk) { unsigned long ctrl; @@ -701,22 +701,22 @@ static __always_inline int timer_shutdown(const int access, static int arch_timer_shutdown_virt(struct clock_event_device *clk) { - return timer_shutdown(ARCH_TIMER_VIRT_ACCESS, clk); + return arch_timer_shutdown(ARCH_TIMER_VIRT_ACCESS, clk); } static int arch_timer_shutdown_phys(struct clock_event_device *clk) { - return timer_shutdown(ARCH_TIMER_PHYS_ACCESS, clk); + return arch_timer_shutdown(ARCH_TIMER_PHYS_ACCESS, clk); } static int arch_timer_shutdown_virt_mem(struct clock_event_device *clk) { - return timer_shutdown(ARCH_TIMER_MEM_VIRT_ACCESS, clk); + return arch_timer_shutdown(ARCH_TIMER_MEM_VIRT_ACCESS, clk); } static int arch_timer_shutdown_phys_mem(struct clock_event_device *clk) { - return timer_shutdown(ARCH_TIMER_MEM_PHYS_ACCESS, clk); + return arch_timer_shutdown(ARCH_TIMER_MEM_PHYS_ACCESS, clk); } static __always_inline void set_next_event(const int access, unsigned long evt,