[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/ax25/af_ax25.c b/net/ax25/af_ax25.c
index b4725ff317c0..a028d37ba2e0 100644
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@ -330,10 +330,9 @@ void ax25_destroy_socket(ax25_cb *ax25)
                 if (atomic_read(&ax25->sk->sk_wmem_alloc) ||
                     atomic_read(&ax25->sk->sk_rmem_alloc)) {
                         /* Defer: outstanding buffers */
-                        init_timer(&ax25->dtimer);
+                        setup_timer(&ax25->dtimer, ax25_destroy_timer,
+                                        (unsigned long)ax25);
                         ax25->dtimer.expires  = jiffies + 2 * HZ;
-                        ax25->dtimer.function = ax25_destroy_timer;
-                        ax25->dtimer.data     = (unsigned long)ax25;
                         add_timer(&ax25->dtimer);
                 } else {
                         struct sock *sk=ax25->sk;