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/netrom/nr_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/netrom/nr_timer.c')
-rw-r--r-- | net/netrom/nr_timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netrom/nr_timer.c b/net/netrom/nr_timer.c index 43569aea0f5e..cbd51ed5a2d7 100644 --- a/net/netrom/nr_timer.c +++ b/net/netrom/nr_timer.c | |||
@@ -45,7 +45,7 @@ void nr_init_timers(struct sock *sk) | |||
45 | timer_setup(&nr->idletimer, nr_idletimer_expiry, 0); | 45 | timer_setup(&nr->idletimer, nr_idletimer_expiry, 0); |
46 | 46 | ||
47 | /* initialized by sock_init_data */ | 47 | /* initialized by sock_init_data */ |
48 | sk->sk_timer.function = (TIMER_FUNC_TYPE)nr_heartbeat_expiry; | 48 | sk->sk_timer.function = nr_heartbeat_expiry; |
49 | } | 49 | } |
50 | 50 | ||
51 | void nr_start_t1timer(struct sock *sk) | 51 | void nr_start_t1timer(struct sock *sk) |