Skip to content

Commit 9a716ac

Browse files
Ingo MolnarKAGA-KOKO
authored andcommitted
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
1 parent 9505215 commit 9a716ac

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

include/linux/timer.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ static inline void timer_init_key_on_stack(struct timer_list *timer,
9494
timer_init_key((_timer), (_fn), (_flags), #_timer, &__key);\
9595
} while (0)
9696

97-
#define __init_timer_on_stack(_timer, _fn, _flags) \
97+
#define __timer_init_on_stack(_timer, _fn, _flags) \
9898
do { \
9999
static struct lock_class_key __key; \
100100
timer_init_key_on_stack((_timer), (_fn), (_flags), \
@@ -103,7 +103,7 @@ static inline void timer_init_key_on_stack(struct timer_list *timer,
103103
#else
104104
#define __timer_init(_timer, _fn, _flags) \
105105
timer_init_key((_timer), (_fn), (_flags), NULL, NULL)
106-
#define __init_timer_on_stack(_timer, _fn, _flags) \
106+
#define __timer_init_on_stack(_timer, _fn, _flags) \
107107
timer_init_key_on_stack((_timer), (_fn), (_flags), NULL, NULL)
108108
#endif
109109

@@ -121,7 +121,7 @@ static inline void timer_init_key_on_stack(struct timer_list *timer,
121121
__timer_init((timer), (callback), (flags))
122122

123123
#define timer_setup_on_stack(timer, callback, flags) \
124-
__init_timer_on_stack((timer), (callback), (flags))
124+
__timer_init_on_stack((timer), (callback), (flags))
125125

126126
#ifdef CONFIG_DEBUG_OBJECTS_TIMERS
127127
extern void destroy_timer_on_stack(struct timer_list *timer);

include/linux/workqueue.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ static inline unsigned int work_static(struct work_struct *work) { return 0; }
324324
#define __INIT_DELAYED_WORK_ONSTACK(_work, _func, _tflags) \
325325
do { \
326326
INIT_WORK_ONSTACK(&(_work)->work, (_func)); \
327-
__init_timer_on_stack(&(_work)->timer, \
327+
__timer_init_on_stack(&(_work)->timer, \
328328
delayed_work_timer_fn, \
329329
(_tflags) | TIMER_IRQSAFE); \
330330
} while (0)

0 commit comments

Comments
 (0)