Skip to content

Commit e86e439

Browse files
Ingo MolnarKAGA-KOKO
authored andcommitted
timers: Rename init_timer_key() as timer_init_key()
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-3-mingo@kernel.org
1 parent 92a09c4 commit e86e439

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

include/linux/timer.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
/*
6868
* LOCKDEP and DEBUG timer interfaces.
6969
*/
70-
void init_timer_key(struct timer_list *timer,
70+
void timer_init_key(struct timer_list *timer,
7171
void (*func)(struct timer_list *), unsigned int flags,
7272
const char *name, struct lock_class_key *key);
7373

@@ -83,15 +83,15 @@ static inline void init_timer_on_stack_key(struct timer_list *timer,
8383
const char *name,
8484
struct lock_class_key *key)
8585
{
86-
init_timer_key(timer, func, flags, name, key);
86+
timer_init_key(timer, func, flags, name, key);
8787
}
8888
#endif
8989

9090
#ifdef CONFIG_LOCKDEP
9191
#define __init_timer(_timer, _fn, _flags) \
9292
do { \
9393
static struct lock_class_key __key; \
94-
init_timer_key((_timer), (_fn), (_flags), #_timer, &__key);\
94+
timer_init_key((_timer), (_fn), (_flags), #_timer, &__key);\
9595
} while (0)
9696

9797
#define __init_timer_on_stack(_timer, _fn, _flags) \
@@ -102,7 +102,7 @@ static inline void init_timer_on_stack_key(struct timer_list *timer,
102102
} while (0)
103103
#else
104104
#define __init_timer(_timer, _fn, _flags) \
105-
init_timer_key((_timer), (_fn), (_flags), NULL, NULL)
105+
timer_init_key((_timer), (_fn), (_flags), NULL, NULL)
106106
#define __init_timer_on_stack(_timer, _fn, _flags) \
107107
init_timer_on_stack_key((_timer), (_fn), (_flags), NULL, NULL)
108108
#endif

kernel/time/timer.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -904,25 +904,25 @@ static void do_init_timer(struct timer_list *timer,
904904
}
905905

906906
/**
907-
* init_timer_key - initialize a timer
907+
* timer_init_key - initialize a timer
908908
* @timer: the timer to be initialized
909909
* @func: timer callback function
910910
* @flags: timer flags
911911
* @name: name of the timer
912912
* @key: lockdep class key of the fake lock used for tracking timer
913913
* sync lock dependencies
914914
*
915-
* init_timer_key() must be done to a timer prior to calling *any* of the
915+
* timer_init_key() must be done to a timer prior to calling *any* of the
916916
* other timer functions.
917917
*/
918-
void init_timer_key(struct timer_list *timer,
918+
void timer_init_key(struct timer_list *timer,
919919
void (*func)(struct timer_list *), unsigned int flags,
920920
const char *name, struct lock_class_key *key)
921921
{
922922
debug_init(timer);
923923
do_init_timer(timer, func, flags, name, key);
924924
}
925-
EXPORT_SYMBOL(init_timer_key);
925+
EXPORT_SYMBOL(timer_init_key);
926926

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

0 commit comments

Comments
 (0)