Skip to content

Commit ae4535b

Browse files
t-8chThomas Gleixner
authored andcommitted
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
1 parent 84663a5 commit ae4535b

2 files changed

Lines changed: 3 additions & 18 deletions

File tree

include/linux/hrtimer.h

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,6 @@ static inline void hrtimer_set_expires_range_ns(struct hrtimer *timer, ktime_t t
112112
timer->node.expires = ktime_add_safe(time, ns_to_ktime(delta));
113113
}
114114

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-
121115
static inline void hrtimer_add_expires(struct hrtimer *timer, ktime_t time)
122116
{
123117
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)
140134
return timer->_softexpires;
141135
}
142136

143-
static inline s64 hrtimer_get_expires_tv64(const struct hrtimer *timer)
144-
{
145-
return timer->node.expires;
146-
}
147-
static inline s64 hrtimer_get_softexpires_tv64(const struct hrtimer *timer)
148-
{
149-
return timer->_softexpires;
150-
}
151-
152137
static inline s64 hrtimer_get_expires_ns(const struct hrtimer *timer)
153138
{
154139
return ktime_to_ns(timer->node.expires);

kernel/time/hrtimer.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -814,7 +814,7 @@ static void hrtimer_reprogram(struct hrtimer *timer, bool reprogram)
814814
struct hrtimer_clock_base *base = timer->base;
815815
ktime_t expires = ktime_sub(hrtimer_get_expires(timer), base->offset);
816816

817-
WARN_ON_ONCE(hrtimer_get_expires_tv64(timer) < 0);
817+
WARN_ON_ONCE(hrtimer_get_expires(timer) < 0);
818818

819819
/*
820820
* 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)
10611061

10621062
orun = ktime_divns(delta, incr);
10631063
hrtimer_add_expires_ns(timer, incr * orun);
1064-
if (hrtimer_get_expires_tv64(timer) > now)
1064+
if (hrtimer_get_expires(timer) > now)
10651065
return orun;
10661066
/*
10671067
* 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,
18431843
* are right-of a not yet expired timer, because that
18441844
* timer will have to trigger a wakeup anyway.
18451845
*/
1846-
if (basenow < hrtimer_get_softexpires_tv64(timer))
1846+
if (basenow < hrtimer_get_softexpires(timer))
18471847
break;
18481848

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

0 commit comments

Comments
 (0)