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

timers: Rename init_timer_key() as timer_init_key() 



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-3-mingo@kernel.org
parent 92a09c47

include/linux/timer.h

+4 −4
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ 
/*

 * LOCKDEP and DEBUG timer interfaces.

 */

void init_timer_key(struct timer_list *timer,

void timer_init_key(struct timer_list *timer,

		    void (*func)(struct timer_list *), unsigned int flags,

		    const char *name, struct lock_class_key *key);
@@ -83,7 +83,7 @@ static inline void init_timer_on_stack_key(struct timer_list *timer, 
					   const char *name,

					   struct lock_class_key *key)

{

	init_timer_key(timer, func, flags, name, key);

	timer_init_key(timer, func, flags, name, key);

}

#endif
@@ -91,7 +91,7 @@ static inline void init_timer_on_stack_key(struct timer_list *timer, 
#define __init_timer(_timer, _fn, _flags)				\

	do {								\

		static struct lock_class_key __key;			\

		init_timer_key((_timer), (_fn), (_flags), #_timer, &__key);\

		timer_init_key((_timer), (_fn), (_flags), #_timer, &__key);\

	} while (0)



#define __init_timer_on_stack(_timer, _fn, _flags)			\
@@ -102,7 +102,7 @@ static inline void init_timer_on_stack_key(struct timer_list *timer, 
	} while (0)

#else

#define __init_timer(_timer, _fn, _flags)				\

	init_timer_key((_timer), (_fn), (_flags), NULL, NULL)

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

#define __init_timer_on_stack(_timer, _fn, _flags)			\

	init_timer_on_stack_key((_timer), (_fn), (_flags), NULL, NULL)

#endif

kernel/time/timer.c

+4 −4
Original line number Diff line number Diff line
@@ -904,7 +904,7 @@ static void do_init_timer(struct timer_list *timer, 
}



/**

 * init_timer_key - initialize a timer

 * timer_init_key - initialize a timer

 * @timer: the timer to be initialized

 * @func: timer callback function

 * @flags: timer flags
@@ -912,17 +912,17 @@ static void do_init_timer(struct timer_list *timer, 
 * @key: lockdep class key of the fake lock used for tracking timer

 *       sync lock dependencies

 *

 * init_timer_key() must be done to a timer prior to calling *any* of the

 * timer_init_key() must be done to a timer prior to calling *any* of the

 * other timer functions.

 */

void init_timer_key(struct timer_list *timer,

void timer_init_key(struct timer_list *timer,

		    void (*func)(struct timer_list *), unsigned int flags,

		    const char *name, struct lock_class_key *key)

{

	debug_init(timer);

	do_init_timer(timer, func, flags, name, key);

}

EXPORT_SYMBOL(init_timer_key);

EXPORT_SYMBOL(timer_init_key);



static inline void detach_timer(struct timer_list *timer, bool clear_pending)

{