diff options
| author | Nam Cao <namcao@linutronix.de> | 2025-02-05 11:55:12 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-04-05 10:30:17 +0200 |
| commit | 87d82cff3829733fa6838492a9215303ad98a61c (patch) | |
| tree | 560c924211fb338329db7bbff3d13b961f327002 | |
| parent | 50177a8b2ec756a03f635444538da928dc5ac488 (diff) | |
| download | linux-87d82cff3829733fa6838492a9215303ad98a61c.tar.gz linux-87d82cff3829733fa6838492a9215303ad98a61c.tar.bz2 linux-87d82cff3829733fa6838492a9215303ad98a61c.zip | |
hrtimers: Merge __hrtimer_init() into __hrtimer_setup()
__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
| -rw-r--r-- | kernel/time/hrtimer.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c index 2d2835cf2659..163cde35f0c3 100644 --- a/kernel/time/hrtimer.c +++ b/kernel/time/hrtimer.c @@ -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; |