Skip to content

Commit fe90c5b

Browse files
anna-marialxKAGA-KOKO
authored andcommitted
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 <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Reviewed-by: Frederic Weisbecker <[email protected]> Link: https://lore.kernel.org/all/20240904-devel-anna-maria-b4-timers-flseep-v1-1-e98760256370@linutronix.de
1 parent d7b01b8 commit fe90c5b

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

kernel/time/timer.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1900,7 +1900,7 @@ static int next_pending_bucket(struct timer_base *base, unsigned offset,
19001900
*
19011901
* Store next expiry time in base->next_expiry.
19021902
*/
1903-
static void next_expiry_recalc(struct timer_base *base)
1903+
static void timer_recalc_next_expiry(struct timer_base *base)
19041904
{
19051905
unsigned long clk, next, adj;
19061906
unsigned lvl, offset = 0;
@@ -2009,7 +2009,7 @@ static unsigned long next_timer_interrupt(struct timer_base *base,
20092009
unsigned long basej)
20102010
{
20112011
if (base->next_expiry_recalc)
2012-
next_expiry_recalc(base);
2012+
timer_recalc_next_expiry(base);
20132013

20142014
/*
20152015
* 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)
24132413
* jiffies to avoid endless requeuing to current jiffies.
24142414
*/
24152415
base->clk++;
2416-
next_expiry_recalc(base);
2416+
timer_recalc_next_expiry(base);
24172417

24182418
while (levels--)
24192419
expire_timers(base, heads + levels);

0 commit comments

Comments
 (0)