timers: Move store of next event into __next_timer_interrupt()

Both call sites of __next_timer_interrupt() store the return value directly
in base->next_expiry. Move the store into __next_timer_interrupt() and to
make its purpose more clear, rename the function to next_expiry_recalc().

No functional change.

Signed-off-by: Anna-Maria Behnsen <anna-maria@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Frederic Weisbecker <frederic@kernel.org>
Link: https://lore.kernel.org/r/20231201092654.34614-8-anna-maria@linutronix.de

diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index 91882059bf3d04790d875acd9b2f7872aabc3082..490ff8e66fc2af552e44e6fff8445a7d7d820408 100644 (file)
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -1800,8 +1800,10 @@ static int next_pending_bucket(struct timer_base *base, unsigned offset,
 /*
  * Search the first expiring timer in the various clock levels. Caller must
  * hold base->lock.
+ *
+ * Store next expiry time in base->next_expiry.
  */
-static unsigned long __next_timer_interrupt(struct timer_base *base)
+static void next_expiry_recalc(struct timer_base *base)
 {
        unsigned long clk, next, adj;
        unsigned lvl, offset = 0;
@@ -1867,10 +1869,9 @@ static unsigned long __next_timer_interrupt(struct timer_base *base)
                clk += adj;
        }
 
+       base->next_expiry = next;
        base->next_expiry_recalc = false;
        base->timers_pending = !(next == base->clk + NEXT_TIMER_MAX_DELTA);
-
-       return next;
 }
 
 #ifdef CONFIG_NO_HZ_COMMON
@@ -1930,7 +1931,7 @@ u64 get_next_timer_interrupt(unsigned long basej, u64 basem)
 
        raw_spin_lock(&base->lock);
        if (base->next_expiry_recalc)
-               base->next_expiry = __next_timer_interrupt(base);
+               next_expiry_recalc(base);
        nextevt = base->next_expiry;
 
        /*
@@ -2021,7 +2022,7 @@ static inline void __run_timers(struct timer_base *base)
                WARN_ON_ONCE(!levels && !base->next_expiry_recalc
                             && base->timers_pending);
                base->clk++;
-               base->next_expiry = __next_timer_interrupt(base);
+               next_expiry_recalc(base);
 
                while (levels--)
                        expire_timers(base, heads + levels);