[PATCH 1/3] IB/i40iw: use setup_timer

[Geliang Tang]

Use setup_timer() instead of init_timer() to simplify the code.

Signed-off-by: Geliang Tang <geliangt...@gmail.com>
---
 drivers/infiniband/hw/i40iw/i40iw_cm.c    | 5 ++---
 drivers/infiniband/hw/i40iw/i40iw_utils.c | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/infiniband/hw/i40iw/i40iw_cm.c 
b/drivers/infiniband/hw/i40iw/i40iw_cm.c
index 95a0586..f3bc01b 100644
--- a/drivers/infiniband/hw/i40iw/i40iw_cm.c
+++ b/drivers/infiniband/hw/i40iw/i40iw_cm.c
@@ -3184,9 +3184,8 @@ void i40iw_setup_cm_core(struct i40iw_device *iwdev)
        INIT_LIST_HEAD(&cm_core->connected_nodes);
        INIT_LIST_HEAD(&cm_core->listen_nodes);
 
-       init_timer(&cm_core->tcp_timer);
-       cm_core->tcp_timer.function = i40iw_cm_timer_tick;
-       cm_core->tcp_timer.data = (unsigned long)cm_core;
+       setup_timer(&cm_core->tcp_timer, i40iw_cm_timer_tick,
+                   (unsigned long)cm_core);
 
        spin_lock_init(&cm_core->ht_lock);
        spin_lock_init(&cm_core->listen_list_lock);
diff --git a/drivers/infiniband/hw/i40iw/i40iw_utils.c 
b/drivers/infiniband/hw/i40iw/i40iw_utils.c
index 70c3e9e..f6967d0 100644
--- a/drivers/infiniband/hw/i40iw/i40iw_utils.c
+++ b/drivers/infiniband/hw/i40iw/i40iw_utils.c
@@ -1436,9 +1436,8 @@ void i40iw_hw_stats_start_timer(struct i40iw_sc_vsi *vsi)
 {
        struct i40iw_vsi_pestat *devstat = vsi->pestat;
 
-       init_timer(&devstat->stats_timer);
-       devstat->stats_timer.function = i40iw_hw_stats_timeout;
-       devstat->stats_timer.data = (unsigned long)vsi;
+       setup_timer(&devstat->stats_timer, i40iw_hw_stats_timeout,
+                   (unsigned long)vsi);
        mod_timer(&devstat->stats_timer,
                  jiffies + msecs_to_jiffies(STATS_TIMER_DELAY));
 }
-- 
2.9.3