[tip: timers/core] clocksource: Remove unused WATCHDOG_INTERVAL_NS macro

From: tip-bot2 for Zhan Xusheng

Date: Mon Jul 06 2026 - 12:27:13 EST


The following commit has been merged into the timers/core branch of tip:

Commit-ID: b3afded935a8528d3df57198aaa90651995622c5
Gitweb: https://git.kernel.org/tip/b3afded935a8528d3df57198aaa90651995622c5
Author: Zhan Xusheng <zhanxusheng1024@xxxxxxxxx>
AuthorDate: Mon, 06 Jul 2026 16:45:57 +08:00
Committer: Thomas Gleixner <tglx@xxxxxxxxxx>
CommitterDate: Mon, 06 Jul 2026 17:51:36 +02:00

clocksource: Remove unused WATCHDOG_INTERVAL_NS macro

WATCHDOG_INTERVAL_NS has been unused since it was introduced by commit
763aacf86f1b ("clocksource: Rewrite watchdog code completely"); the
watchdog timer rearming uses WATCHDOG_INTERVAL (in jiffies) directly and
the nanosecond variant has never had a user.

Remove the dead macro. No functional change.

Signed-off-by: Zhan Xusheng <zhanxusheng@xxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxx>
Link: https://patch.msgid.link/20260706084557.3845091-3-zhanxusheng@xxxxxxxxxx
---
kernel/time/clocksource.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c
index e48c4d3..78c91b0 100644
--- a/kernel/time/clocksource.c
+++ b/kernel/time/clocksource.c
@@ -123,7 +123,6 @@ static atomic_t watchdog_reset_pending;

/* Watchdog interval: 0.5sec. */
#define WATCHDOG_INTERVAL (HZ >> 1)
-#define WATCHDOG_INTERVAL_NS (WATCHDOG_INTERVAL * (NSEC_PER_SEC / HZ))

/* Maximum time between two reference watchdog readouts */
#define WATCHDOG_READOUT_MAX_NS (50U * NSEC_PER_USEC)