timers: Rename __init_timer_on_stack() as __timer_init_on_stack()

Move this API to the canonical __timer_*() namespace.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20250507175338.672442-6-mingo@kernel.org

diff --git a/include/linux/timer.h b/include/linux/timer.h
index 11e1fac18f0eeeeb783215bfe3d00f6fb6b554ab..4e1237ff4b246ac91886b14baff49bcdc4f799cd 100644 (file)
--- a/include/linux/timer.h
+++ b/include/linux/timer.h
@@ -94,7 +94,7 @@ static inline void timer_init_key_on_stack(struct timer_list *timer,
                timer_init_key((_timer), (_fn), (_flags), #_timer, &__key);\
        } while (0)
 
-#define __init_timer_on_stack(_timer, _fn, _flags)                     \
+#define __timer_init_on_stack(_timer, _fn, _flags)                     \
        do {                                                            \
                static struct lock_class_key __key;                     \
                timer_init_key_on_stack((_timer), (_fn), (_flags),      \
@@ -103,7 +103,7 @@ static inline void timer_init_key_on_stack(struct timer_list *timer,
 #else
 #define __timer_init(_timer, _fn, _flags)                              \
        timer_init_key((_timer), (_fn), (_flags), NULL, NULL)
-#define __init_timer_on_stack(_timer, _fn, _flags)                     \
+#define __timer_init_on_stack(_timer, _fn, _flags)                     \
        timer_init_key_on_stack((_timer), (_fn), (_flags), NULL, NULL)
 #endif
 
@@ -121,7 +121,7 @@ static inline void timer_init_key_on_stack(struct timer_list *timer,
        __timer_init((timer), (callback), (flags))
 
 #define timer_setup_on_stack(timer, callback, flags)           \
-       __init_timer_on_stack((timer), (callback), (flags))
+       __timer_init_on_stack((timer), (callback), (flags))
 
 #ifdef CONFIG_DEBUG_OBJECTS_TIMERS
 extern void destroy_timer_on_stack(struct timer_list *timer);

diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h
index 985f69f8fb997446ecd5da74d1b23b7e66380e64..c84da78878d9a647bc4cac3005195ffc1e7b321b 100644 (file)
--- a/include/linux/workqueue.h
+++ b/include/linux/workqueue.h
@@ -324,7 +324,7 @@ static inline unsigned int work_static(struct work_struct *work) { return 0; }
 #define __INIT_DELAYED_WORK_ONSTACK(_work, _func, _tflags)             \
        do {                                                            \
                INIT_WORK_ONSTACK(&(_work)->work, (_func));             \
-               __init_timer_on_stack(&(_work)->timer,                  \
+               __timer_init_on_stack(&(_work)->timer,                  \
                                      delayed_work_timer_fn,            \
                                      (_tflags) | TIMER_IRQSAFE);       \
        } while (0)