alarmtimers: Remove return value from alarm functions

Now that the SIG_IGN problem is solved in the core code, the alarmtimer
callbacks do not require a return value anymore.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Frederic Weisbecker <frederic@kernel.org>
Link: https://lore.kernel.org/all/20241105064214.318837272@linutronix.de

diff --git a/drivers/power/supply/charger-manager.c b/drivers/power/supply/charger-manager.c
index 96f0a7fbf10518c838c36f3c24bbcbe22765b3b1..09ec0ecf1486397f3a6bc512507c1eaf8ffbfad6 100644 (file)
--- a/drivers/power/supply/charger-manager.c
+++ b/drivers/power/supply/charger-manager.c
@@ -1412,10 +1412,9 @@ static inline struct charger_desc *cm_get_drv_data(struct platform_device *pdev)
        return dev_get_platdata(&pdev->dev);
 }
 
-static enum alarmtimer_restart cm_timer_func(struct alarm *alarm, ktime_t now)
+static void cm_timer_func(struct alarm *alarm, ktime_t now)
 {
        cm_timer_set = false;
-       return ALARMTIMER_NORESTART;
 }
 
 static int charger_manager_probe(struct platform_device *pdev)

diff --git a/fs/timerfd.c b/fs/timerfd.c
index 137523e0bb211389888283b1a87c25c1aa4991ef..f10c99ad5c6009a0f158ee913483a99ae33dcc92 100644 (file)
--- a/fs/timerfd.c
+++ b/fs/timerfd.c
@@ -79,13 +79,11 @@ static enum hrtimer_restart timerfd_tmrproc(struct hrtimer *htmr)
        return HRTIMER_NORESTART;
 }
 
-static enum alarmtimer_restart timerfd_alarmproc(struct alarm *alarm,
-       ktime_t now)
+static void timerfd_alarmproc(struct alarm *alarm, ktime_t now)
 {
        struct timerfd_ctx *ctx = container_of(alarm, struct timerfd_ctx,
                                               t.alarm);
        timerfd_triggered(ctx);
-       return ALARMTIMER_NORESTART;
 }
 
 /*

diff --git a/include/linux/alarmtimer.h b/include/linux/alarmtimer.h
index 05e758b8b894541c1388b8ec97300dc8573fa317..3ffa5341dce21440f5822d726475bc8635a3dc4d 100644 (file)
--- a/include/linux/alarmtimer.h
+++ b/include/linux/alarmtimer.h
@@ -20,12 +20,6 @@ enum alarmtimer_type {
        ALARM_BOOTTIME_FREEZER,
 };
 
-enum alarmtimer_restart {
-       ALARMTIMER_NORESTART,
-       ALARMTIMER_RESTART,
-};
-
-
 #define ALARMTIMER_STATE_INACTIVE      0x00
 #define ALARMTIMER_STATE_ENQUEUED      0x01
 
@@ -42,14 +36,14 @@ enum alarmtimer_restart {
 struct alarm {
        struct timerqueue_node  node;
        struct hrtimer          timer;
-       enum alarmtimer_restart (*function)(struct alarm *, ktime_t now);
+       void                    (*function)(struct alarm *, ktime_t now);
        enum alarmtimer_type    type;
        int                     state;
        void                    *data;
 };
 
 void alarm_init(struct alarm *alarm, enum alarmtimer_type type,
-               enum alarmtimer_restart (*function)(struct alarm *, ktime_t));
+               void (*function)(struct alarm *, ktime_t));
 void alarm_start(struct alarm *alarm, ktime_t start);
 void alarm_start_relative(struct alarm *alarm, ktime_t start);
 void alarm_restart(struct alarm *alarm);

diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
index 593e7d561fa867327e48c0fcc4da4b6839458c3d..37d2d79daea49146a1e6cda517979c1ba78dfc39 100644 (file)
--- a/kernel/time/alarmtimer.c
+++ b/kernel/time/alarmtimer.c
@@ -321,7 +321,7 @@ static int alarmtimer_resume(struct device *dev)
 
 static void
 __alarm_init(struct alarm *alarm, enum alarmtimer_type type,
-            enum alarmtimer_restart (*function)(struct alarm *, ktime_t))
+            void (*function)(struct alarm *, ktime_t))
 {
        timerqueue_init(&alarm->node);
        alarm->timer.function = alarmtimer_fired;
@@ -337,7 +337,7 @@ __alarm_init(struct alarm *alarm, enum alarmtimer_type type,
  * @function: callback that is run when the alarm fires
  */
 void alarm_init(struct alarm *alarm, enum alarmtimer_type type,
-               enum alarmtimer_restart (*function)(struct alarm *, ktime_t))
+               void (*function)(struct alarm *, ktime_t))
 {
        hrtimer_init(&alarm->timer, alarm_bases[type].base_clockid,
                     HRTIMER_MODE_ABS);
@@ -530,14 +530,12 @@ static enum alarmtimer_type clock2alarm(clockid_t clockid)
  *
  * Return: whether the timer is to be restarted
  */
-static enum alarmtimer_restart alarm_handle_timer(struct alarm *alarm, ktime_t now)
+static void alarm_handle_timer(struct alarm *alarm, ktime_t now)
 {
        struct k_itimer *ptr = container_of(alarm, struct k_itimer, it.alarm.alarmtimer);
 
        guard(spinlock_irqsave)(&ptr->it_lock);
        posix_timer_queue_signal(ptr);
-
-       return ALARMTIMER_NORESTART;
 }
 
 /**
@@ -698,18 +696,14 @@ static int alarm_timer_create(struct k_itimer *new_timer)
  * @now: time at the timer expiration
  *
  * Wakes up the task that set the alarmtimer
- *
- * Return: ALARMTIMER_NORESTART
  */
-static enum alarmtimer_restart alarmtimer_nsleep_wakeup(struct alarm *alarm,
-                                                               ktime_t now)
+static void alarmtimer_nsleep_wakeup(struct alarm *alarm, ktime_t now)
 {
        struct task_struct *task = alarm->data;
 
        alarm->data = NULL;
        if (task)
                wake_up_process(task);
-       return ALARMTIMER_NORESTART;
 }
 
 /**
@@ -761,7 +755,7 @@ static int alarmtimer_do_nsleep(struct alarm *alarm, ktime_t absexp,
 
 static void
 alarm_init_on_stack(struct alarm *alarm, enum alarmtimer_type type,
-                   enum alarmtimer_restart (*function)(struct alarm *, ktime_t))
+                   void (*function)(struct alarm *, ktime_t))
 {
        hrtimer_init_on_stack(&alarm->timer, alarm_bases[type].base_clockid,
                              HRTIMER_MODE_ABS);

diff --git a/net/netfilter/xt_IDLETIMER.c b/net/netfilter/xt_IDLETIMER.c
index db720efa811d58cb4dffa14fe0dccfa8dcb152c8..5514600586a91d35c4c4aa6484ff119261f9895e 100644 (file)
--- a/net/netfilter/xt_IDLETIMER.c
+++ b/net/netfilter/xt_IDLETIMER.c
@@ -107,14 +107,12 @@ static void idletimer_tg_expired(struct timer_list *t)
        schedule_work(&timer->work);
 }
 
-static enum alarmtimer_restart idletimer_tg_alarmproc(struct alarm *alarm,
-                                                         ktime_t now)
+static void idletimer_tg_alarmproc(struct alarm *alarm, ktime_t now)
 {
        struct idletimer_tg *timer = alarm->data;
 
        pr_debug("alarm %s expired\n", timer->attr.attr.name);
        schedule_work(&timer->work);
-       return ALARMTIMER_NORESTART;
 }
 
 static int idletimer_check_sysfs_name(const char *name, unsigned int size)