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>

2 files changed, 8 insertions, 8 deletions

diff --git a/net/rose/rose_link.c b/net/rose/rose_link.c
index cda4c6678ef1..62055d3069d2 100644
--- a/net/rose/rose_link.c
+++ b/net/rose/rose_link.c
@@ -37,7 +37,7 @@ void rose_start_ftimer(struct rose_neigh *neigh)
 {
         del_timer(&neigh->ftimer);
 
-        neigh->ftimer.function = (TIMER_FUNC_TYPE)rose_ftimer_expiry;
+        neigh->ftimer.function = rose_ftimer_expiry;
         neigh->ftimer.expires  =
                 jiffies + msecs_to_jiffies(sysctl_rose_link_fail_timeout);
 
@@ -48,7 +48,7 @@ static void rose_start_t0timer(struct rose_neigh *neigh)
 {
         del_timer(&neigh->t0timer);
 
-        neigh->t0timer.function = (TIMER_FUNC_TYPE)rose_t0timer_expiry;
+        neigh->t0timer.function = rose_t0timer_expiry;
         neigh->t0timer.expires  =
                 jiffies + msecs_to_jiffies(sysctl_rose_restart_request_timeout);
 
diff --git a/net/rose/rose_timer.c b/net/rose/rose_timer.c
index ea613b2a9735..74555fb95615 100644
--- a/net/rose/rose_timer.c
+++ b/net/rose/rose_timer.c
@@ -36,7 +36,7 @@ void rose_start_heartbeat(struct sock *sk)
 {
         del_timer(&sk->sk_timer);
 
-        sk->sk_timer.function = (TIMER_FUNC_TYPE)rose_heartbeat_expiry;
+        sk->sk_timer.function = rose_heartbeat_expiry;
         sk->sk_timer.expires  = jiffies + 5 * HZ;
 
         add_timer(&sk->sk_timer);
@@ -48,7 +48,7 @@ void rose_start_t1timer(struct sock *sk)
 
         del_timer(&rose->timer);
 
-        rose->timer.function = (TIMER_FUNC_TYPE)rose_timer_expiry;
+        rose->timer.function = rose_timer_expiry;
         rose->timer.expires  = jiffies + rose->t1;
 
         add_timer(&rose->timer);
@@ -60,7 +60,7 @@ void rose_start_t2timer(struct sock *sk)
 
         del_timer(&rose->timer);
 
-        rose->timer.function = (TIMER_FUNC_TYPE)rose_timer_expiry;
+        rose->timer.function = rose_timer_expiry;
         rose->timer.expires  = jiffies + rose->t2;
 
         add_timer(&rose->timer);
@@ -72,7 +72,7 @@ void rose_start_t3timer(struct sock *sk)
 
         del_timer(&rose->timer);
 
-        rose->timer.function = (TIMER_FUNC_TYPE)rose_timer_expiry;
+        rose->timer.function = rose_timer_expiry;
         rose->timer.expires  = jiffies + rose->t3;
 
         add_timer(&rose->timer);
@@ -84,7 +84,7 @@ void rose_start_hbtimer(struct sock *sk)
 
         del_timer(&rose->timer);
 
-        rose->timer.function = (TIMER_FUNC_TYPE)rose_timer_expiry;
+        rose->timer.function = rose_timer_expiry;
         rose->timer.expires  = jiffies + rose->hb;
 
         add_timer(&rose->timer);
@@ -97,7 +97,7 @@ void rose_start_idletimer(struct sock *sk)
         del_timer(&rose->idletimer);
 
         if (rose->idle > 0) {
-                rose->idletimer.function = (TIMER_FUNC_TYPE)rose_idletimer_expiry;
+                rose->idletimer.function = rose_idletimer_expiry;
                 rose->idletimer.expires  = jiffies + rose->idle;
 
                 add_timer(&rose->idletimer);