Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Link: https://patch.msgid.link/20260107-hrtimer-header-cleanup-v1-3-1a698ef0ddae@linutronix.de
authored by
Thomas Weißschuh
and committed by
Thomas Gleixner
ae4535b0
84663a5a
+3
-18
-15
include/linux/hrtimer.h
-15
include/linux/hrtimer.h
···
112
112
timer->node.expires = ktime_add_safe(time, ns_to_ktime(delta));
113
113
}
114
114
115
-
static inline void hrtimer_set_expires_tv64(struct hrtimer *timer, s64 tv64)
116
-
{
117
-
timer->node.expires = tv64;
118
-
timer->_softexpires = tv64;
119
-
}
120
-
121
115
static inline void hrtimer_add_expires(struct hrtimer *timer, ktime_t time)
122
116
{
123
117
timer->node.expires = ktime_add_safe(timer->node.expires, time);
···
130
136
}
131
137
132
138
static inline ktime_t hrtimer_get_softexpires(const struct hrtimer *timer)
133
-
{
134
-
return timer->_softexpires;
135
-
}
136
-
137
-
static inline s64 hrtimer_get_expires_tv64(const struct hrtimer *timer)
138
-
{
139
-
return timer->node.expires;
140
-
}
141
-
static inline s64 hrtimer_get_softexpires_tv64(const struct hrtimer *timer)
142
139
{
143
140
return timer->_softexpires;
144
141
}
+3
-3
kernel/time/hrtimer.c
+3
-3
kernel/time/hrtimer.c
···
814
814
struct hrtimer_clock_base *base = timer->base;
815
815
ktime_t expires = ktime_sub(hrtimer_get_expires(timer), base->offset);
816
816
817
-
WARN_ON_ONCE(hrtimer_get_expires_tv64(timer) < 0);
817
+
WARN_ON_ONCE(hrtimer_get_expires(timer) < 0);
818
818
819
819
/*
820
820
* CLOCK_REALTIME timer might be requested with an absolute
···
1061
1061
1062
1062
orun = ktime_divns(delta, incr);
1063
1063
hrtimer_add_expires_ns(timer, incr * orun);
1064
-
if (hrtimer_get_expires_tv64(timer) > now)
1064
+
if (hrtimer_get_expires(timer) > now)
1065
1065
return orun;
1066
1066
/*
1067
1067
* This (and the ktime_add() below) is the
···
1843
1843
* are right-of a not yet expired timer, because that
1844
1844
* timer will have to trigger a wakeup anyway.
1845
1845
*/
1846
-
if (basenow < hrtimer_get_softexpires_tv64(timer))
1846
+
if (basenow < hrtimer_get_softexpires(timer))
1847
1847
break;
1848
1848
1849
1849
__run_hrtimer(cpu_base, base, timer, &basenow, flags);