3 files changed, 6 insertions, 12 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;
 }
diff --git a/net/dccp/timer.c b/net/dccp/timer.c
index 3af067354bd4..8703a792b560 100644
--- a/net/dccp/timer.c
+++ b/net/dccp/timer.c
@@ -280,9 +280,8 @@ static void dccp_init_write_xmit_timer(struct sock *sk)
 {
         struct dccp_sock *dp = dccp_sk(sk);
 
-        init_timer(&dp->dccps_xmit_timer);
-        dp->dccps_xmit_timer.data = (unsigned long)sk;
-        dp->dccps_xmit_timer.function = dccp_write_xmit_timer;
+        setup_timer(&dp->dccps_xmit_timer, dccp_write_xmit_timer,
+                        (unsigned long)sk);
 }
 
 void dccp_init_xmit_timers(struct sock *sk)