[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, 10 insertions, 15 deletions

diff --git a/net/llc/llc_conn.c b/net/llc/llc_conn.c
index 5c0b484237c8..441bc18f996d 100644
--- a/net/llc/llc_conn.c
+++ b/net/llc/llc_conn.c
@@ -831,25 +831,21 @@ static void llc_sk_init(struct sock* sk)
         llc->inc_cntr = llc->dec_cntr = 2;
         llc->dec_step = llc->connect_step = 1;
 
-        init_timer(&llc->ack_timer.timer);
+        setup_timer(&llc->ack_timer.timer, llc_conn_ack_tmr_cb,
+                        (unsigned long)sk);
         llc->ack_timer.expire         = sysctl_llc2_ack_timeout;
-        llc->ack_timer.timer.data     = (unsigned long)sk;
-        llc->ack_timer.timer.function = llc_conn_ack_tmr_cb;
 
-        init_timer(&llc->pf_cycle_timer.timer);
+        setup_timer(&llc->pf_cycle_timer.timer, llc_conn_pf_cycle_tmr_cb,
+                        (unsigned long)sk);
         llc->pf_cycle_timer.expire         = sysctl_llc2_p_timeout;
-        llc->pf_cycle_timer.timer.data     = (unsigned long)sk;
-        llc->pf_cycle_timer.timer.function = llc_conn_pf_cycle_tmr_cb;
 
-        init_timer(&llc->rej_sent_timer.timer);
+        setup_timer(&llc->rej_sent_timer.timer, llc_conn_rej_tmr_cb,
+                        (unsigned long)sk);
         llc->rej_sent_timer.expire         = sysctl_llc2_rej_timeout;
-        llc->rej_sent_timer.timer.data     = (unsigned long)sk;
-        llc->rej_sent_timer.timer.function = llc_conn_rej_tmr_cb;
 
-        init_timer(&llc->busy_state_timer.timer);
+        setup_timer(&llc->busy_state_timer.timer, llc_conn_busy_tmr_cb,
+                        (unsigned long)sk);
         llc->busy_state_timer.expire         = sysctl_llc2_busy_timeout;
-        llc->busy_state_timer.timer.data     = (unsigned long)sk;
-        llc->busy_state_timer.timer.function = llc_conn_busy_tmr_cb;
 
         llc->n2 = 2;   /* max retransmit */
         llc->k  = 2;   /* tx win size, will adjust dynam */
diff --git a/net/llc/llc_station.c b/net/llc/llc_station.c
index 576355a192ab..6f2ea2090322 100644
--- a/net/llc/llc_station.c
+++ b/net/llc/llc_station.c
@@ -688,9 +688,8 @@ int __init llc_station_init(void)
         skb_queue_head_init(&llc_main_station.mac_pdu_q);
         skb_queue_head_init(&llc_main_station.ev_q.list);
         spin_lock_init(&llc_main_station.ev_q.lock);
-        init_timer(&llc_main_station.ack_timer);
-        llc_main_station.ack_timer.data     = (unsigned long)&llc_main_station;
-        llc_main_station.ack_timer.function = llc_station_ack_tmr_cb;
+        setup_timer(&llc_main_station.ack_timer, llc_station_ack_tmr_cb,
+                        (unsigned long)&llc_main_station);
         llc_main_station.ack_timer.expires  = jiffies +
                                                 sysctl_llc_station_ack_timeout;
         skb = alloc_skb(0, GFP_ATOMIC);