[NET]: Convert init_timer into setup_timer

Many-many code in the kernel initialized the timer->function
and  timer->data together with calling init_timer(timer). There
is already a helper for this. Use it for networking code.

The patch is HUGE, but makes the code 130 lines shorter
(98 insertions(+), 228 deletions(-)).

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 2 insertions, 7 deletions

diff --git a/net/x25/x25_link.c b/net/x25/x25_link.c
index 741ce95d4ad1..753f2b64abe2 100644
--- a/net/x25/x25_link.c
+++ b/net/x25/x25_link.c
@@ -247,10 +247,7 @@ void x25_link_device_up(struct net_device *dev)
                 return;
 
         skb_queue_head_init(&nb->queue);
-
-        init_timer(&nb->t20timer);
-        nb->t20timer.data     = (unsigned long)nb;
-        nb->t20timer.function = &x25_t20timer_expiry;
+        setup_timer(&nb->t20timer, x25_t20timer_expiry, (unsigned long)nb);
 
         dev_hold(dev);
         nb->dev      = dev;
diff --git a/net/x25/x25_timer.c b/net/x25/x25_timer.c
index 2af190dc5b01..d3e3e54db936 100644
--- a/net/x25/x25_timer.c
+++ b/net/x25/x25_timer.c
@@ -33,9 +33,7 @@ void x25_init_timers(struct sock *sk)
 {
         struct x25_sock *x25 = x25_sk(sk);
 
-        init_timer(&x25->timer);
-        x25->timer.data     = (unsigned long)sk;
-        x25->timer.function = &x25_timer_expiry;
+        setup_timer(&x25->timer, x25_timer_expiry, (unsigned long)sk);
 
         /* initialized by sock_init_data */
         sk->sk_timer.data     = (unsigned long)sk;