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 /net/lapb/lapb_timer.c | |
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 'net/lapb/lapb_timer.c')
-rw-r--r-- | net/lapb/lapb_timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/lapb/lapb_timer.c b/net/lapb/lapb_timer.c index 8bb469cb3abe..5d4ae01951b5 100644 --- a/net/lapb/lapb_timer.c +++ b/net/lapb/lapb_timer.c | |||
@@ -42,7 +42,7 @@ void lapb_start_t1timer(struct lapb_cb *lapb) | |||
42 | { | 42 | { |
43 | del_timer(&lapb->t1timer); | 43 | del_timer(&lapb->t1timer); |
44 | 44 | ||
45 | lapb->t1timer.function = (TIMER_FUNC_TYPE)lapb_t1timer_expiry; | 45 | lapb->t1timer.function = lapb_t1timer_expiry; |
46 | lapb->t1timer.expires = jiffies + lapb->t1; | 46 | lapb->t1timer.expires = jiffies + lapb->t1; |
47 | 47 | ||
48 | add_timer(&lapb->t1timer); | 48 | add_timer(&lapb->t1timer); |
@@ -52,7 +52,7 @@ void lapb_start_t2timer(struct lapb_cb *lapb) | |||
52 | { | 52 | { |
53 | del_timer(&lapb->t2timer); | 53 | del_timer(&lapb->t2timer); |
54 | 54 | ||
55 | lapb->t2timer.function = (TIMER_FUNC_TYPE)lapb_t2timer_expiry; | 55 | lapb->t2timer.function = lapb_t2timer_expiry; |
56 | lapb->t2timer.expires = jiffies + lapb->t2; | 56 | lapb->t2timer.expires = jiffies + lapb->t2; |
57 | 57 | ||
58 | add_timer(&lapb->t2timer); | 58 | add_timer(&lapb->t2timer); |