Skip to contentSkip to conversation

alarmtimer: Remove stale return description from alarm_handle_timer()

PATCH Applied Zhan Xusheng 2 participants 2 messages Apr 29 – May 6 Timekeeping, clocksource core, NTP, alarmtimer

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 alarmtimer: Remove stale return description from alarm_handle_timer()

alarm_handle_timer() was converted from returning enum alarmtimer_restart to void, but the kernel-doc "Return:" line was not removed. Remove the stale description.

Fixes 2634303f8773 ("alarmtimers: Remove return value from alarm functions")
---
 kernel/time/alarmtimer.c | 2 --
 1 file changed, 2 deletions(-)
kernel/time/alarmtimer.c +0 -2
index 6e173d70d825..fe9c42c03523 100644
@@ -512,8 +512,6 @@ static enum alarmtimer_type clock2alarm(clockid_t clockid)
  * @now: time at the timer expiration
  *
  * Posix timer callback for expired alarm timers.
- *
- * Return: whether the timer is to be restarted
  */
 static void alarm_handle_timer(struct alarm *alarm, ktime_t now)
 {
Signature · 1 line
2.43.0
merge bot Applied
#1 lore raw
The following commit has been merged into the timers/core branch of tip:

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

Commit-ID:     ed3b3c4976686b63b28e44f9805a88abc20ff18a
Gitweb:        https://git.kernel.org/tip/ed3b3c4976686b63b28e44f9805a88abc20ff18a
Author:        Zhan Xusheng <[email protected]>
AuthorDate:    Wed, 29 Apr 2026 16:06:35 +08:00
Committer:     Thomas Gleixner <[email protected]>
CommitterDate: Wed, 06 May 2026 08:33:08 +02:00

alarmtimer: Remove stale return description from alarm_handle_timer()

alarm_handle_timer() was converted from returning enum alarmtimer_restart to void, but the kernel-doc "Return:" line was not removed. Remove the stale description.

Fixes 2634303f8773 ("alarmtimers: Remove return value from alarm functions")
---
 kernel/time/alarmtimer.c | 2 --
 1 file changed, 2 deletions(-)
kernel/time/alarmtimer.c +0 -2
index 9275fe4..ea5be58 100644
@@ -496,8 +496,6 @@ static enum alarmtimer_type clock2alarm(clockid_t clockid)
  * @now: time at the timer expiration
  *
  * Posix timer callback for expired alarm timers.
- *
- * Return: whether the timer is to be restarted
  */
 static void alarm_handle_timer(struct alarm *alarm, ktime_t now)
 {