Commit 87d82cff authored by Nam Cao's avatar Nam Cao Committed by Ingo Molnar
Browse files

hrtimers: Merge __hrtimer_init() into __hrtimer_setup() 



__hrtimer_init() is only called by __hrtimer_setup(). Simplify by merging
__hrtimer_init() into __hrtimer_setup().

Signed-off-by: default avatarNam Cao <namcao@linutronix.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/all/8a0a847a35f711f66b2d05b57255aa44e7e61279.1738746927.git.namcao@linutronix.de
parent 50177a8b

kernel/time/hrtimer.c

+3 −9
Original line number Diff line number Diff line
@@ -1592,8 +1592,9 @@ static inline int hrtimer_clockid_to_base(clockid_t clock_id) 
	}

}



static void __hrtimer_init(struct hrtimer *timer, clockid_t clock_id,

			   enum hrtimer_mode mode)

static void __hrtimer_setup(struct hrtimer *timer,

			    enum hrtimer_restart (*function)(struct hrtimer *),

			    clockid_t clock_id, enum hrtimer_mode mode)

{

	bool softtimer = !!(mode & HRTIMER_MODE_SOFT);

	struct hrtimer_cpu_base *cpu_base;
@@ -1626,13 +1627,6 @@ static void __hrtimer_init(struct hrtimer *timer, clockid_t clock_id, 
	timer->is_hard = !!(mode & HRTIMER_MODE_HARD);

	timer->base = &cpu_base->clock_base[base];

	timerqueue_init(&timer->node);

}



static void __hrtimer_setup(struct hrtimer *timer,

			    enum hrtimer_restart (*function)(struct hrtimer *),

			    clockid_t clock_id, enum hrtimer_mode mode)

{

	__hrtimer_init(timer, clock_id, mode);



	if (WARN_ON_ONCE(!function))

		timer->function = hrtimer_dummy_timeout;