diff options
| author |   Su Hui <suhui@nfschina.com> | 2025-04-30 11:27:33 +0800 |
|---|---|---|
| committer |   Thomas Gleixner <tglx@linutronix.de> | 2025-04-30 09:06:23 +0200 |
| commit | d8ca84d48a2a2d4f6780980743c34b70c49f5844 (patch) | |
| tree | 8dfcfec199672b25381d9cc8795beef0c9f8bb36 | |
| parent | time/jiffies: Change register_refined_jiffies() to void __init (diff) | |
| download | linux-rng-d8ca84d48a2a2d4f6780980743c34b70c49f5844.tar.xz linux-rng-d8ca84d48a2a2d4f6780980743c34b70c49f5844.zip | |
alarmtimer: Remove dead return value in clock2alarm()
'clockid' can only be ALARM_REALTIME and ALARM_BOOTTIME. It's impossible to
return -1 and callers never check the return value.
Only alarm_clock_get_timespec(), alarm_clock_get_ktime(),
alarm_timer_create() and alarm_timer_nsleep() call clock2alarm(). These
callers use clockid_to_kclock() to get 'struct k_clock', which ensures
that clock2alarm() never returns -1.
Remove the impossible -1 return value, and add a warning to notify about any
future misuse of this function.
Signed-off-by: Su Hui <suhui@nfschina.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20250430032734.2079290-3-suhui@nfschina.com
| -rw-r--r-- | kernel/time/alarmtimer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c index 0ddccdff119a..621d39666e29 100644 --- a/kernel/time/alarmtimer.c +++ b/kernel/time/alarmtimer.c @@ -515,9 +515,9 @@ static enum alarmtimer_type clock2alarm(clockid_t clockid) { if (clockid == CLOCK_REALTIME_ALARM) return ALARM_REALTIME; - if (clockid == CLOCK_BOOTTIME_ALARM) - return ALARM_BOOTTIME; - return -1; + + WARN_ON_ONCE(clockid != CLOCK_BOOTTIME_ALARM); + return ALARM_BOOTTIME; } /** |