Commit 9505215b authored by Ingo Molnar's avatar Ingo Molnar Committed by Thomas Gleixner
Browse files

timers: Rename __init_timer() as __timer_init() 



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

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20250507175338.672442-5-mingo@kernel.org
parent 7879d10d

include/linux/timer.h

+3 −3
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ static inline void timer_init_key_on_stack(struct timer_list *timer, 
#endif



#ifdef CONFIG_LOCKDEP

#define __init_timer(_timer, _fn, _flags)				\

#define __timer_init(_timer, _fn, _flags)				\

	do {								\

		static struct lock_class_key __key;			\

		timer_init_key((_timer), (_fn), (_flags), #_timer, &__key);\
@@ -101,7 +101,7 @@ static inline void timer_init_key_on_stack(struct timer_list *timer, 
					#_timer, &__key);		 \

	} while (0)

#else

#define __init_timer(_timer, _fn, _flags)				\

#define __timer_init(_timer, _fn, _flags)				\

	timer_init_key((_timer), (_fn), (_flags), NULL, NULL)

#define __init_timer_on_stack(_timer, _fn, _flags)			\

	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, 
 * be used and must be balanced with a call to destroy_timer_on_stack().

 */

#define timer_setup(timer, callback, flags)			\

	__init_timer((timer), (callback), (flags))

	__timer_init((timer), (callback), (flags))



#define timer_setup_on_stack(timer, callback, flags)		\

	__init_timer_on_stack((timer), (callback), (flags))

include/linux/workqueue.h

+1 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ static inline unsigned int work_static(struct work_struct *work) { return 0; } 
#define __INIT_DELAYED_WORK(_work, _func, _tflags)			\

	do {								\

		INIT_WORK(&(_work)->work, (_func));			\

		__init_timer(&(_work)->timer,				\

		__timer_init(&(_work)->timer,				\

			     delayed_work_timer_fn,			\

			     (_tflags) | TIMER_IRQSAFE);		\

	} while (0)