lkml.org 
[lkml]   [2022]   [Nov]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[patch V3 03/17] clocksource/drivers/arm_arch_timer: Do not use timer namespace for timer_shutdown() function
    Date
    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.

    Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Tested-by: Guenter Roeck <linux@roeck-us.net>
    Reviewed-by: Guenter Roeck <linux@roeck-us.net>
    Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
    Acked-by: Marc Zyngier <maz@kernel.org>
    Link: https://lkml.kernel.org/r/20221106212702.002251651@goodmis.org
    Link: https://lore.kernel.org/all/20221105060155.409832154@goodmis.org/
    Link: https://lore.kernel.org/r/20221110064146.981725531@goodmis.org


    ---
    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
    \
     
     \ /
      Last update: 2022-11-23 21:22    [W:2.086 / U:0.140 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site