alarmtimer: Switch to use hrtimer_setup() and hrtimer_setup_on_stack()

hrtimer_setup() and hrtimer_setup_on_stack() take the callback function
pointer as argument and initialize the timer completely.

Replace the hrtimer_init*() variants and the open coded initialization of
hrtimer::function with the new setup mechanism.

Switch to use the new functions.

Signed-off-by: Nam Cao <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>
Link: https://lore.kernel.org/all/2bae912336103405adcdab96b88d3ea0353b4228.1730386209.git.namcao@linutronix.de

diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
index 37d2d79daea49146a1e6cda517979c1ba78dfc39..0ddccdff119a0190f16d88c98d9aac4e037ad42d 100644 (file)
--- a/kernel/time/alarmtimer.c
+++ b/kernel/time/alarmtimer.c
@@ -324,7 +324,6 @@ __alarm_init(struct alarm *alarm, enum alarmtimer_type type,
             void (*function)(struct alarm *, ktime_t))
 {
        timerqueue_init(&alarm->node);
-       alarm->timer.function = alarmtimer_fired;
        alarm->function = function;
        alarm->type = type;
        alarm->state = ALARMTIMER_STATE_INACTIVE;
@@ -339,8 +338,8 @@ __alarm_init(struct alarm *alarm, enum alarmtimer_type type,
 void alarm_init(struct alarm *alarm, enum alarmtimer_type type,
                void (*function)(struct alarm *, ktime_t))
 {
-       hrtimer_init(&alarm->timer, alarm_bases[type].base_clockid,
-                    HRTIMER_MODE_ABS);
+       hrtimer_setup(&alarm->timer, alarmtimer_fired, alarm_bases[type].base_clockid,
+                     HRTIMER_MODE_ABS);
        __alarm_init(alarm, type, function);
 }
 EXPORT_SYMBOL_GPL(alarm_init);
@@ -757,8 +756,8 @@ static void
 alarm_init_on_stack(struct alarm *alarm, enum alarmtimer_type type,
                    void (*function)(struct alarm *, ktime_t))
 {
-       hrtimer_init_on_stack(&alarm->timer, alarm_bases[type].base_clockid,
-                             HRTIMER_MODE_ABS);
+       hrtimer_setup_on_stack(&alarm->timer, alarmtimer_fired, alarm_bases[type].base_clockid,
+                              HRTIMER_MODE_ABS);
        __alarm_init(alarm, type, function);
 }