aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2017-10-22 18:18:19 -0700
committerKees Cook <keescook@chromium.org>2017-11-21 15:57:12 -0800
commitc1eba5bcb6430868427e0b9d1cd1205a07302f06 (patch)
tree1bddfc4131bcc5281e31bd6bd33a7fc9e41ad36e /include
parent9477b4ad7019ad423cc88a6b83fa717a5d8d9857 (diff)
timer: Pass timer_list pointer to callbacks unconditionally
Now that all timer callbacks are already taking their struct timer_list pointer as the callback argument, just do this unconditionally and remove the .data field. Cc: Thomas Gleixner <tglx@linutronix.de> Cc: John Stultz <john.stultz@linaro.org> Cc: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Kees Cook <keescook@chromium.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/timer.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/timer.h b/include/linux/timer.h
index 47615dca4c5c..20a6e7af5fd6 100644
--- a/include/linux/timer.h
+++ b/include/linux/timer.h
@@ -18,7 +18,6 @@ struct timer_list {
struct hlist_node entry;
unsigned long expires;
void (*function)(unsigned long);
- unsigned long data;
u32 flags;
#ifdef CONFIG_LOCKDEP
@@ -70,7 +69,6 @@ struct timer_list {
#define __TIMER_INITIALIZER(_function, _data, _flags) { \
.entry = { .next = TIMER_ENTRY_STATIC }, \
.function = (_function), \
- .data = (_data), \
.flags = (_flags), \
__TIMER_LOCKDEP_MAP_INITIALIZER( \
__FILE__ ":" __stringify(__LINE__)) \
@@ -121,14 +119,12 @@ static inline void init_timer_on_stack_key(struct timer_list *timer,
do { \
__init_timer((_timer), (_flags)); \
(_timer)->function = (_fn); \
- (_timer)->data = (_data); \
} while (0)
#define __setup_timer_on_stack(_timer, _fn, _data, _flags) \
do { \
__init_timer_on_stack((_timer), (_flags)); \
(_timer)->function = (_fn); \
- (_timer)->data = (_data); \
} while (0)
#ifndef CONFIG_LOCKDEP

Privacy Policy