@@ -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))
0 commit comments