Skip to content

Commit 8fae141

Browse files
covanamKAGA-KOKO
authored andcommitted
timers: Switch to use hrtimer_setup_sleeper_on_stack()
hrtimer_setup_sleeper_on_stack() replaces hrtimer_init_sleeper_on_stack() to keep the naming convention consistent. Convert the usage sites over to it. The conversion was done with Coccinelle. Signed-off-by: Nam Cao <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Link: https://lore.kernel.org/all/299c07f0f96af8ab3a7631b47b6ca22b06b20577.1730386209.git.namcao@linutronix.de
1 parent eb68845 commit 8fae141

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

kernel/time/hrtimer.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2138,8 +2138,7 @@ static long __sched hrtimer_nanosleep_restart(struct restart_block *restart)
21382138
struct hrtimer_sleeper t;
21392139
int ret;
21402140

2141-
hrtimer_init_sleeper_on_stack(&t, restart->nanosleep.clockid,
2142-
HRTIMER_MODE_ABS);
2141+
hrtimer_setup_sleeper_on_stack(&t, restart->nanosleep.clockid, HRTIMER_MODE_ABS);
21432142
hrtimer_set_expires_tv64(&t.timer, restart->nanosleep.expires);
21442143
ret = do_nanosleep(&t, HRTIMER_MODE_ABS);
21452144
destroy_hrtimer_on_stack(&t.timer);
@@ -2153,7 +2152,7 @@ long hrtimer_nanosleep(ktime_t rqtp, const enum hrtimer_mode mode,
21532152
struct hrtimer_sleeper t;
21542153
int ret = 0;
21552154

2156-
hrtimer_init_sleeper_on_stack(&t, clockid, mode);
2155+
hrtimer_setup_sleeper_on_stack(&t, clockid, mode);
21572156
hrtimer_set_expires_range_ns(&t.timer, rqtp, current->timer_slack_ns);
21582157
ret = do_nanosleep(&t, mode);
21592158
if (ret != -ERESTART_RESTARTBLOCK)

kernel/time/sleep_timeout.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ int __sched schedule_hrtimeout_range_clock(ktime_t *expires, u64 delta,
208208
return -EINTR;
209209
}
210210

211-
hrtimer_init_sleeper_on_stack(&t, clock_id, mode);
211+
hrtimer_setup_sleeper_on_stack(&t, clock_id, mode);
212212
hrtimer_set_expires_range_ns(&t.timer, *expires, delta);
213213
hrtimer_sleeper_start_expires(&t, mode);
214214

0 commit comments

Comments
 (0)