Skip to content

Commit 9505215

Browse files
Ingo MolnarKAGA-KOKO
authored andcommitted
timers: Rename __init_timer() as __timer_init()
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-5-mingo@kernel.org
1 parent 7879d10 commit 9505215

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
@@ -88,7 +88,7 @@ static inline void timer_init_key_on_stack(struct timer_list *timer,
8888
#endif
8989

9090
#ifdef CONFIG_LOCKDEP
91-
#define __init_timer(_timer, _fn, _flags) \
91+
#define __timer_init(_timer, _fn, _flags) \
9292
do { \
9393
static struct lock_class_key __key; \
9494
timer_init_key((_timer), (_fn), (_flags), #_timer, &__key);\
@@ -101,7 +101,7 @@ static inline void timer_init_key_on_stack(struct timer_list *timer,
101101
#_timer, &__key); \
102102
} while (0)
103103
#else
104-
#define __init_timer(_timer, _fn, _flags) \
104+
#define __timer_init(_timer, _fn, _flags) \
105105
timer_init_key((_timer), (_fn), (_flags), NULL, NULL)
106106
#define __init_timer_on_stack(_timer, _fn, _flags) \
107107
timer_init_key_on_stack((_timer), (_fn), (_flags), NULL, NULL)
@@ -118,7 +118,7 @@ static inline void timer_init_key_on_stack(struct timer_list *timer,
118118
* be used and must be balanced with a call to destroy_timer_on_stack().
119119
*/
120120
#define timer_setup(timer, callback, flags) \
121-
__init_timer((timer), (callback), (flags))
121+
__timer_init((timer), (callback), (flags))
122122

123123
#define timer_setup_on_stack(timer, callback, flags) \
124124
__init_timer_on_stack((timer), (callback), (flags))

include/linux/workqueue.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ static inline unsigned int work_static(struct work_struct *work) { return 0; }
316316
#define __INIT_DELAYED_WORK(_work, _func, _tflags) \
317317
do { \
318318
INIT_WORK(&(_work)->work, (_func)); \
319-
__init_timer(&(_work)->timer, \
319+
__timer_init(&(_work)->timer, \
320320
delayed_work_timer_fn, \
321321
(_tflags) | TIMER_IRQSAFE); \
322322
} while (0)

0 commit comments

Comments
 (0)