Merge branch 'for-linus-min' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...

[firefly-linux-kernel-4.4.55.git] / net / netrom / nr_timer.c

diff --git a/net/netrom/nr_timer.c b/net/netrom/nr_timer.c
index 6cfaad952c6cdcbd36e5991355b1673f7394d211..ff2c1b142f578ea60d9d3e16fa466bc20c62fec9 100644 (file)
--- a/net/netrom/nr_timer.c
+++ b/net/netrom/nr_timer.c
@@ -24,7 +24,6 @@
 #include <net/sock.h>
 #include <net/tcp_states.h>
 #include <asm/uaccess.h>
-#include <asm/system.h>
 #include <linux/fcntl.h>
 #include <linux/mm.h>
 #include <linux/interrupt.h>
@@ -40,21 +39,10 @@ void nr_init_timers(struct sock *sk)
 {
        struct nr_sock *nr = nr_sk(sk);
 
-       init_timer(&nr->t1timer);
-       nr->t1timer.data     = (unsigned long)sk;
-       nr->t1timer.function = &nr_t1timer_expiry;
-
-       init_timer(&nr->t2timer);
-       nr->t2timer.data     = (unsigned long)sk;
-       nr->t2timer.function = &nr_t2timer_expiry;
-
-       init_timer(&nr->t4timer);
-       nr->t4timer.data     = (unsigned long)sk;
-       nr->t4timer.function = &nr_t4timer_expiry;
-
-       init_timer(&nr->idletimer);
-       nr->idletimer.data     = (unsigned long)sk;
-       nr->idletimer.function = &nr_idletimer_expiry;
+       setup_timer(&nr->t1timer, nr_t1timer_expiry, (unsigned long)sk);
+       setup_timer(&nr->t2timer, nr_t2timer_expiry, (unsigned long)sk);
+       setup_timer(&nr->t4timer, nr_t4timer_expiry, (unsigned long)sk);
+       setup_timer(&nr->idletimer, nr_idletimer_expiry, (unsigned long)sk);
 
        /* initialized by sock_init_data */
        sk->sk_timer.data     = (unsigned long)sk;