timers: Rename next_expiry_recalc() to be unique

next_expiry_recalc is the name of a function as well as the name of a
struct member of struct timer_base. This might lead to confusion.

Rename next_expiry_recalc() to timer_recalc_next_expiry(). No functional
change.

Signed-off-by: Anna-Maria Behnsen <anna-maria@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Frederic Weisbecker <frederic@kernel.org>
Link: https://lore.kernel.org/all/20240904-devel-anna-maria-b4-timers-flseep-v1-1-e98760256370@linutronix.de

diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index 311ea459b976936e409a4cc522296cf1f77e53ed..5e021a2d8d61042b91bf9c967e73935e9f86c6fd 100644 (file)
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -1900,7 +1900,7 @@ static int next_pending_bucket(struct timer_base *base, unsigned offset,
  *
  * Store next expiry time in base->next_expiry.
  */
-static void next_expiry_recalc(struct timer_base *base)
+static void timer_recalc_next_expiry(struct timer_base *base)
 {
        unsigned long clk, next, adj;
        unsigned lvl, offset = 0;
@@ -2009,7 +2009,7 @@ static unsigned long next_timer_interrupt(struct timer_base *base,
                                          unsigned long basej)
 {
        if (base->next_expiry_recalc)
-               next_expiry_recalc(base);
+               timer_recalc_next_expiry(base);
 
        /*
         * Move next_expiry for the empty base into the future to prevent an
@@ -2413,7 +2413,7 @@ static inline void __run_timers(struct timer_base *base)
                 * jiffies to avoid endless requeuing to current jiffies.
                 */
                base->clk++;
-               next_expiry_recalc(base);
+               timer_recalc_next_expiry(base);
 
                while (levels--)
                        expire_timers(base, heads + levels);