[tip: timers/core] clocksource: Clean up clocksource_update_freq() functions
From: tip-bot2 for Thomas Weißschuh <hidden>
Date: 2026-05-06 07:11:36
Subsystem:
the rest, timekeeping, clocksource core, ntp, alarmtimer · Maintainers:
Linus Torvalds, John Stultz, Thomas Gleixner
The following commit has been merged into the timers/core branch of tip: Commit-ID: 33d4bfc49613301c8e451a597e377aaa331944bc Gitweb: https://git.kernel.org/tip/33d4bfc49613301c8e451a597e377aaa331944bc Author: Thomas Weißschuh [off-list ref] AuthorDate: Mon, 04 May 2026 08:54:27 +02:00 Committer: Thomas Gleixner [off-list ref] CommitterDate: Wed, 06 May 2026 08:33:08 +02:00 clocksource: Clean up clocksource_update_freq() functions Remove the unused functions __clocksource_update_freq_hz() and __clocksource_update_freq_khz(). Then make __clocksource_update_freq_scale() static as it is not used from external callers anymore. Also clean up the comment accordingly. Signed-off-by: Thomas Weißschuh <redacted> Signed-off-by: Thomas Gleixner <tglx@kernel.org> Acked-by: John Stultz <jstultz@google.com> Link: https://patch.msgid.link/20260504-clocksource-update_freq-v2-1-3e696fb01776@linutronix.de --- include/linux/clocksource.h | 12 ------------ kernel/time/clocksource.c | 9 +-------- 2 files changed, 1 insertion(+), 20 deletions(-)
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
index 7c38190..c61aa45 100644
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h@@ -236,8 +236,6 @@ clocks_calc_mult_shift(u32 *mult, u32 *shift, u32 from, u32 to, u32 minsec); */ extern int __clocksource_register_scale(struct clocksource *cs, u32 scale, u32 freq); -extern void -__clocksource_update_freq_scale(struct clocksource *cs, u32 scale, u32 freq); /* * Don't call this unless you are a default clocksource
@@ -258,16 +256,6 @@ static inline int clocksource_register_khz(struct clocksource *cs, u32 khz) return __clocksource_register_scale(cs, 1000, khz); } -static inline void __clocksource_update_freq_hz(struct clocksource *cs, u32 hz) -{ - __clocksource_update_freq_scale(cs, 1, hz); -} - -static inline void __clocksource_update_freq_khz(struct clocksource *cs, u32 khz) -{ - __clocksource_update_freq_scale(cs, 1000, khz); -} - #ifdef CONFIG_ARCH_CLOCKSOURCE_INIT extern void clocksource_arch_init(struct clocksource *cs); #else
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c
index baee13a..f8d15ed 100644
--- a/kernel/time/clocksource.c
+++ b/kernel/time/clocksource.c@@ -1222,14 +1222,8 @@ static void clocksource_enqueue(struct clocksource *cs) * @cs: clocksource to be registered * @scale: Scale factor multiplied against freq to get clocksource hz * @freq: clocksource frequency (cycles per second) divided by scale - * - * This should only be called from the clocksource->enable() method. - * - * This *SHOULD NOT* be called directly! Please use the - * __clocksource_update_freq_hz() or __clocksource_update_freq_khz() helper - * functions. */ -void __clocksource_update_freq_scale(struct clocksource *cs, u32 scale, u32 freq) +static void __clocksource_update_freq_scale(struct clocksource *cs, u32 scale, u32 freq) { u64 sec;
@@ -1287,7 +1281,6 @@ void __clocksource_update_freq_scale(struct clocksource *cs, u32 scale, u32 freq pr_info("%s: mask: 0x%llx max_cycles: 0x%llx, max_idle_ns: %lld ns\n", cs->name, cs->mask, cs->max_cycles, cs->max_idle_ns); } -EXPORT_SYMBOL_GPL(__clocksource_update_freq_scale); /** * __clocksource_register_scale - Used to install new clocksources