summaryrefslogtreecommitdiff
path: root/include/linux/timer.h
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2017-10-22 18:22:50 -0700
committerKees Cook <keescook@chromium.org>2017-11-21 15:57:14 -0800
commit1fe66ba572b455270dc35a2c099dd7328cec9e4c (patch)
tree28ef99f61598350d30e3cd86636e21485cac4a6b /include/linux/timer.h
parent354b46b1a0adda1dd5b7f0bc2a5604cca091be5f (diff)
downloadlwn-1fe66ba572b455270dc35a2c099dd7328cec9e4c.tar.gz
lwn-1fe66ba572b455270dc35a2c099dd7328cec9e4c.zip
timer: Remove unused data arguments from macros
With the .data field removed, the ignored data arguments in timer macros can be removed. Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Tejun Heo <tj@kernel.org> Cc: Lai Jiangshan <jiangshanlai@gmail.com> Cc: Jens Axboe <axboe@kernel.dk> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Shaohua Li <shli@fb.com> Signed-off-by: Kees Cook <keescook@chromium.org>
Diffstat (limited to 'include/linux/timer.h')
-rw-r--r--include/linux/timer.h18
1 files changed, 8 insertions, 10 deletions
diff --git a/include/linux/timer.h b/include/linux/timer.h
index a6d04fb72c9e..e6bab51db13d 100644
--- a/include/linux/timer.h
+++ b/include/linux/timer.h
@@ -66,7 +66,7 @@ struct timer_list {
#define TIMER_DATA_TYPE struct timer_list *
#define TIMER_FUNC_TYPE void (*)(TIMER_DATA_TYPE)
-#define __TIMER_INITIALIZER(_function, _data, _flags) { \
+#define __TIMER_INITIALIZER(_function, _flags) { \
.entry = { .next = TIMER_ENTRY_STATIC }, \
.function = (_function), \
.flags = (_flags), \
@@ -76,7 +76,7 @@ struct timer_list {
#define DEFINE_TIMER(_name, _function) \
struct timer_list _name = \
- __TIMER_INITIALIZER((TIMER_FUNC_TYPE)_function, 0, 0)
+ __TIMER_INITIALIZER((TIMER_FUNC_TYPE)_function, 0)
void init_timer_key(struct timer_list *timer, unsigned int flags,
const char *name, struct lock_class_key *key);
@@ -115,13 +115,13 @@ static inline void init_timer_on_stack_key(struct timer_list *timer,
init_timer_on_stack_key((_timer), (_flags), NULL, NULL)
#endif
-#define __setup_timer(_timer, _fn, _data, _flags) \
+#define __setup_timer(_timer, _fn, _flags) \
do { \
__init_timer((_timer), (_flags)); \
(_timer)->function = (_fn); \
} while (0)
-#define __setup_timer_on_stack(_timer, _fn, _data, _flags) \
+#define __setup_timer_on_stack(_timer, _fn, _flags) \
do { \
__init_timer_on_stack((_timer), (_flags)); \
(_timer)->function = (_fn); \
@@ -132,16 +132,14 @@ static inline void timer_setup(struct timer_list *timer,
void (*callback)(struct timer_list *),
unsigned int flags)
{
- __setup_timer(timer, (TIMER_FUNC_TYPE)callback,
- (TIMER_DATA_TYPE)timer, flags);
+ __setup_timer(timer, (TIMER_FUNC_TYPE)callback, flags);
}
static inline void timer_setup_on_stack(struct timer_list *timer,
void (*callback)(struct timer_list *),
unsigned int flags)
{
- __setup_timer_on_stack(timer, (TIMER_FUNC_TYPE)callback,
- (TIMER_DATA_TYPE)timer, flags);
+ __setup_timer_on_stack(timer, (TIMER_FUNC_TYPE)callback, flags);
}
#else
/*
@@ -151,11 +149,11 @@ static inline void timer_setup_on_stack(struct timer_list *timer,
*/
# define timer_setup(timer, callback, flags) \
__setup_timer((timer), (TIMER_FUNC_TYPE)(callback), \
- (TIMER_DATA_TYPE)(timer), (flags))
+ (flags))
# define timer_setup_on_stack(timer, callback, flags) \
__setup_timer_on_stack((timer), \
(TIMER_FUNC_TYPE)(callback), \
- (TIMER_DATA_TYPE)(timer), (flags))
+ (flags))
#endif
#define from_timer(var, callback_timer, timer_fieldname) \