Commit fe90c5ba authored by Anna-Maria Behnsen's avatar Anna-Maria Behnsen Committed by Thomas Gleixner
Browse files

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: default avatarAnna-Maria Behnsen <anna-maria@linutronix.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarFrederic Weisbecker <frederic@kernel.org>
Link: https://lore.kernel.org/all/20240904-devel-anna-maria-b4-timers-flseep-v1-1-e98760256370@linutronix.de
parent d7b01b81

kernel/time/timer.c

+3 −3
Original line number Diff line number Diff line
@@ -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);