[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>

1 files changed, 2 insertions, 3 deletions

diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
index ed2d65cd8010..323d42a7b360 100644
--- a/net/rose/af_rose.c
+++ b/net/rose/af_rose.c
@@ -345,10 +345,9 @@ void rose_destroy_socket(struct sock *sk)
         if (atomic_read(&sk->sk_wmem_alloc) ||
             atomic_read(&sk->sk_rmem_alloc)) {
                 /* Defer: outstanding buffers */
-                init_timer(&sk->sk_timer);
+                setup_timer(&sk->sk_timer, rose_destroy_timer,
+                                (unsigned long)sk);
                 sk->sk_timer.expires  = jiffies + 10 * HZ;
-                sk->sk_timer.function = rose_destroy_timer;
-                sk->sk_timer.data     = (unsigned long)sk;
                 add_timer(&sk->sk_timer);
         } else
                 sock_put(sk);