[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, 4 insertions, 9 deletions

diff --git a/net/dccp/ccids/ccid2.c b/net/dccp/ccids/ccid2.c
index d694656b8800..c9c465e86281 100644
--- a/net/dccp/ccids/ccid2.c
+++ b/net/dccp/ccids/ccid2.c
@@ -760,10 +760,8 @@ static int ccid2_hc_tx_init(struct ccid *ccid, struct sock *sk)
         hctx->ccid2hctx_rttvar   = -1;
         hctx->ccid2hctx_rpdupack = -1;
         hctx->ccid2hctx_last_cong = jiffies;
-
-        hctx->ccid2hctx_rtotimer.function = &ccid2_hc_tx_rto_expire;
-        hctx->ccid2hctx_rtotimer.data     = (unsigned long)sk;
-        init_timer(&hctx->ccid2hctx_rtotimer);
+        setup_timer(&hctx->ccid2hctx_rtotimer, ccid2_hc_tx_rto_expire,
+                        (unsigned long)sk);
 
         ccid2_hc_tx_check_sanity(hctx);
         return 0;
diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c
index d133416d3970..f56aaecb56b3 100644
--- a/net/dccp/ccids/ccid3.c
+++ b/net/dccp/ccids/ccid3.c
@@ -606,11 +606,8 @@ static int ccid3_hc_tx_init(struct ccid *ccid, struct sock *sk)
 
         hctx->ccid3hctx_state = TFRC_SSTATE_NO_SENT;
         INIT_LIST_HEAD(&hctx->ccid3hctx_hist);
-
-        hctx->ccid3hctx_no_feedback_timer.function =
-                                ccid3_hc_tx_no_feedback_timer;
-        hctx->ccid3hctx_no_feedback_timer.data     = (unsigned long)sk;
-        init_timer(&hctx->ccid3hctx_no_feedback_timer);
+        setup_timer(&hctx->ccid3hctx_no_feedback_timer,
+                        ccid3_hc_tx_no_feedback_timer, (unsigned long)sk);
 
         return 0;
 }