Commit 8fae1411 authored by Nam Cao's avatar Nam Cao Committed by Thomas Gleixner
Browse files

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: default avatarNam Cao <namcao@linutronix.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/299c07f0f96af8ab3a7631b47b6ca22b06b20577.1730386209.git.namcao@linutronix.de
parent eb688451

kernel/time/hrtimer.c

+2 −3
Original line number Diff line number Diff line
@@ -2138,8 +2138,7 @@ static long __sched hrtimer_nanosleep_restart(struct restart_block *restart) 
	struct hrtimer_sleeper t;

	int ret;



	hrtimer_init_sleeper_on_stack(&t, restart->nanosleep.clockid,

				      HRTIMER_MODE_ABS);

	hrtimer_setup_sleeper_on_stack(&t, restart->nanosleep.clockid, HRTIMER_MODE_ABS);

	hrtimer_set_expires_tv64(&t.timer, restart->nanosleep.expires);

	ret = do_nanosleep(&t, HRTIMER_MODE_ABS);

	destroy_hrtimer_on_stack(&t.timer);
@@ -2153,7 +2152,7 @@ long hrtimer_nanosleep(ktime_t rqtp, const enum hrtimer_mode mode, 
	struct hrtimer_sleeper t;

	int ret = 0;



	hrtimer_init_sleeper_on_stack(&t, clockid, mode);

	hrtimer_setup_sleeper_on_stack(&t, clockid, mode);

	hrtimer_set_expires_range_ns(&t.timer, rqtp, current->timer_slack_ns);

	ret = do_nanosleep(&t, mode);

	if (ret != -ERESTART_RESTARTBLOCK)

kernel/time/sleep_timeout.c

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ int __sched schedule_hrtimeout_range_clock(ktime_t *expires, u64 delta, 
		return -EINTR;

	}



	hrtimer_init_sleeper_on_stack(&t, clock_id, mode);

	hrtimer_setup_sleeper_on_stack(&t, clock_id, mode);

	hrtimer_set_expires_range_ns(&t.timer, *expires, delta);

	hrtimer_sleeper_start_expires(&t, mode);