diff options
author | Kees Cook <keescook@chromium.org> | 2017-10-23 03:40:42 -0400 |
---|---|---|
committer | Kees Cook <keescook@chromium.org> | 2017-11-21 19:35:54 -0500 |
commit | 841b86f3289dbe858daeceec36423d4ea286fac2 (patch) | |
tree | 332a53d6045914798e364a534fe3a47cab56d803 /include/linux/timer.h | |
parent | 919b250f8570618e84af544c3e18dad5210eb9b6 (diff) |
treewide: Remove TIMER_FUNC_TYPE and TIMER_DATA_TYPE casts
With all callbacks converted, and the timer callback prototype
switched over, the TIMER_FUNC_TYPE cast is no longer needed,
so remove it. Conversion was done with the following scripts:
perl -pi -e 's|\(TIMER_FUNC_TYPE\)||g' \
$(git grep TIMER_FUNC_TYPE | cut -d: -f1 | sort -u)
perl -pi -e 's|\(TIMER_DATA_TYPE\)||g' \
$(git grep TIMER_DATA_TYPE | cut -d: -f1 | sort -u)
The now unused macros are also dropped from include/linux/timer.h.
Signed-off-by: Kees Cook <keescook@chromium.org>
Diffstat (limited to 'include/linux/timer.h')
-rw-r--r-- | include/linux/timer.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/timer.h b/include/linux/timer.h index b1ae64b112c2..04af640ea95b 100644 --- a/include/linux/timer.h +++ b/include/linux/timer.h | |||
@@ -63,9 +63,6 @@ struct timer_list { | |||
63 | 63 | ||
64 | #define TIMER_TRACE_FLAGMASK (TIMER_MIGRATING | TIMER_DEFERRABLE | TIMER_PINNED | TIMER_IRQSAFE) | 64 | #define TIMER_TRACE_FLAGMASK (TIMER_MIGRATING | TIMER_DEFERRABLE | TIMER_PINNED | TIMER_IRQSAFE) |
65 | 65 | ||
66 | #define TIMER_DATA_TYPE struct timer_list * | ||
67 | #define TIMER_FUNC_TYPE void (*)(TIMER_DATA_TYPE) | ||
68 | |||
69 | #define __TIMER_INITIALIZER(_function, _flags) { \ | 66 | #define __TIMER_INITIALIZER(_function, _flags) { \ |
70 | .entry = { .next = TIMER_ENTRY_STATIC }, \ | 67 | .entry = { .next = TIMER_ENTRY_STATIC }, \ |
71 | .function = (_function), \ | 68 | .function = (_function), \ |
@@ -76,7 +73,7 @@ struct timer_list { | |||
76 | 73 | ||
77 | #define DEFINE_TIMER(_name, _function) \ | 74 | #define DEFINE_TIMER(_name, _function) \ |
78 | struct timer_list _name = \ | 75 | struct timer_list _name = \ |
79 | __TIMER_INITIALIZER((TIMER_FUNC_TYPE)_function, 0) | 76 | __TIMER_INITIALIZER(_function, 0) |
80 | 77 | ||
81 | /* | 78 | /* |
82 | * LOCKDEP and DEBUG timer interfaces. | 79 | * LOCKDEP and DEBUG timer interfaces. |