]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
hrtimers: Merge __hrtimer_init() into __hrtimer_setup()
authorNam Cao <namcao@linutronix.de>
Wed, 5 Feb 2025 10:55:12 +0000 (11:55 +0100)
committerIngo Molnar <mingo@kernel.org>
Sat, 5 Apr 2025 08:30:17 +0000 (10:30 +0200)
__hrtimer_init() is only called by __hrtimer_setup(). Simplify by merging
__hrtimer_init() into __hrtimer_setup().

Signed-off-by: Nam Cao <namcao@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/all/8a0a847a35f711f66b2d05b57255aa44e7e61279.1738746927.git.namcao@linutronix.de
kernel/time/hrtimer.c

index 2d2835cf2659528cddbe8c29e613ddfb033d5ade..163cde35f0c36f548095450b54a6e4a7d63b4189 100644 (file)
@@ -1592,8 +1592,9 @@ static inline int hrtimer_clockid_to_base(clockid_t clock_id)
        }
 }
 
-static void __hrtimer_init(struct hrtimer *timer, clockid_t clock_id,
-                          enum hrtimer_mode mode)
+static void __hrtimer_setup(struct hrtimer *timer,
+                           enum hrtimer_restart (*function)(struct hrtimer *),
+                           clockid_t clock_id, enum hrtimer_mode mode)
 {
        bool softtimer = !!(mode & HRTIMER_MODE_SOFT);
        struct hrtimer_cpu_base *cpu_base;
@@ -1626,13 +1627,6 @@ static void __hrtimer_init(struct hrtimer *timer, clockid_t clock_id,
        timer->is_hard = !!(mode & HRTIMER_MODE_HARD);
        timer->base = &cpu_base->clock_base[base];
        timerqueue_init(&timer->node);
-}
-
-static void __hrtimer_setup(struct hrtimer *timer,
-                           enum hrtimer_restart (*function)(struct hrtimer *),
-                           clockid_t clock_id, enum hrtimer_mode mode)
-{
-       __hrtimer_init(timer, clock_id, mode);
 
        if (WARN_ON_ONCE(!function))
                timer->function = hrtimer_dummy_timeout;