[PATCH V2 12/19] timekeeping: Reuse timekeeping_cycles_to_ns()
flat view
STALE900d
LANDED
From: Adrian Hunter <adrian.hunter@intel.com>
Date: 2024-03-25 06:41:57
Also in:
linux-s390, lkml
Subsystem:
the rest, timekeeping, clocksource core, ntp, alarmtimer · Maintainers:
Linus Torvalds, John Stultz, Thomas Gleixner
Revision v2 of 2 in this series; landed in mainline as 670be12ba8f5 on 2024-04-08.
Revisions (2)
- v1 [diff vs current]
- v2 current
Simplify __timekeeping_get_ns() by reusing timekeeping_cycles_to_ns(). Suggested-by: Thomas Gleixner <redacted> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> --- kernel/time/timekeeping.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index c698219b152d..f81d675291e0 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c@@ -391,10 +391,7 @@ static inline u64 timekeeping_cycles_to_ns(const struct tk_read_base *tkr, u64 c static __always_inline u64 __timekeeping_get_ns(const struct tk_read_base *tkr) { - u64 delta, cycles = tk_clock_read(tkr); - - delta = clocksource_delta(cycles, tkr->cycle_last, tkr->mask); - return timekeeping_delta_to_ns(tkr, delta); + return timekeeping_cycles_to_ns(tkr, tk_clock_read(tkr)); } static inline u64 timekeeping_get_ns(const struct tk_read_base *tkr)
--
2.34.1