Commit 3094c6db authored by Adrian Hunter's avatar Adrian Hunter Committed by Thomas Gleixner
Browse files

timekeeping: Fold in timekeeping_delta_to_ns() 



timekeeping_delta_to_ns() is now called only from
timekeeping_cycles_to_ns(), and it is not useful otherwise.

Simplify the code by folding it into timekeeping_cycles_to_ns().

No functional change.

Suggested-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20240325064023.2997-16-adrian.hunter@intel.com
parent e84f43e3

kernel/time/timekeeping.c

+1 −12
Original line number Diff line number Diff line
@@ -364,23 +364,12 @@ static void tk_setup_internals(struct timekeeper *tk, struct clocksource *clock) 
}



/* Timekeeper helper functions. */



static inline u64 timekeeping_delta_to_ns(const struct tk_read_base *tkr, u64 delta)

{

	u64 nsec;



	nsec = delta * tkr->mult + tkr->xtime_nsec;

	nsec >>= tkr->shift;



	return nsec;

}



static inline u64 timekeeping_cycles_to_ns(const struct tk_read_base *tkr, u64 cycles)

{

	/* Calculate the delta since the last update_wall_time() */

	u64 delta = clocksource_delta(cycles, tkr->cycle_last, tkr->mask);



	return timekeeping_delta_to_ns(tkr, delta);

	return ((delta * tkr->mult) + tkr->xtime_nsec) >> tkr->shift;

}



static __always_inline u64 __timekeeping_get_ns(const struct tk_read_base *tkr)