Commit ae4535b0 authored by Thomas Weißschuh's avatar Thomas Weißschuh Committed by Thomas Gleixner
Browse files

hrtimer: Drop _tv64() helpers 



Since ktime_t has become an alias to s64, these helpers are unnecessary.

Migrate the few remaining users to the regular helpers and remove the
now dead code.

Signed-off-by: default avatarThomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: default avatarThomas Gleixner <tglx@kernel.org>
Link: https://patch.msgid.link/20260107-hrtimer-header-cleanup-v1-3-1a698ef0ddae@linutronix.de
parent 84663a5a

include/linux/hrtimer.h

+0 −15
Original line number Diff line number Diff line
@@ -112,12 +112,6 @@ static inline void hrtimer_set_expires_range_ns(struct hrtimer *timer, ktime_t t 
	timer->node.expires = ktime_add_safe(time, ns_to_ktime(delta));

}



static inline void hrtimer_set_expires_tv64(struct hrtimer *timer, s64 tv64)

{

	timer->node.expires = tv64;

	timer->_softexpires = tv64;

}



static inline void hrtimer_add_expires(struct hrtimer *timer, ktime_t time)

{

	timer->node.expires = ktime_add_safe(timer->node.expires, time);
@@ -140,15 +134,6 @@ static inline ktime_t hrtimer_get_softexpires(const struct hrtimer *timer) 
	return timer->_softexpires;

}



static inline s64 hrtimer_get_expires_tv64(const struct hrtimer *timer)

{

	return timer->node.expires;

}

static inline s64 hrtimer_get_softexpires_tv64(const struct hrtimer *timer)

{

	return timer->_softexpires;

}



static inline s64 hrtimer_get_expires_ns(const struct hrtimer *timer)

{

	return ktime_to_ns(timer->node.expires);

kernel/time/hrtimer.c

+3 −3
Original line number Diff line number Diff line
@@ -814,7 +814,7 @@ static void hrtimer_reprogram(struct hrtimer *timer, bool reprogram) 
	struct hrtimer_clock_base *base = timer->base;

	ktime_t expires = ktime_sub(hrtimer_get_expires(timer), base->offset);



	WARN_ON_ONCE(hrtimer_get_expires_tv64(timer) < 0);

	WARN_ON_ONCE(hrtimer_get_expires(timer) < 0);



	/*

	 * CLOCK_REALTIME timer might be requested with an absolute
@@ -1061,7 +1061,7 @@ u64 hrtimer_forward(struct hrtimer *timer, ktime_t now, ktime_t interval) 


		orun = ktime_divns(delta, incr);

		hrtimer_add_expires_ns(timer, incr * orun);

		if (hrtimer_get_expires_tv64(timer) > now)

		if (hrtimer_get_expires(timer) > now)

			return orun;

		/*

		 * This (and the ktime_add() below) is the
@@ -1843,7 +1843,7 @@ static void __hrtimer_run_queues(struct hrtimer_cpu_base *cpu_base, ktime_t now, 
			 * are right-of a not yet expired timer, because that

			 * timer will have to trigger a wakeup anyway.

			 */

			if (basenow < hrtimer_get_softexpires_tv64(timer))

			if (basenow < hrtimer_get_softexpires(timer))

				break;



			__run_hrtimer(cpu_base, base, timer, &basenow, flags);