summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/hw/i40iw/i40iw_cm.c
diff options
context:
space:
mode:
authorGeliang Tang2017-04-22 03:32:54 +0200
committerDoug Ledford2017-04-28 19:19:05 +0200
commit96ff2c11c5e8f22f88ecb2fd18e8c0546e3936ed (patch)
treef099342d597dafaa5c5d47f05c78be5d141b8948 /drivers/infiniband/hw/i40iw/i40iw_cm.c
parentIB/nes: Fix incorrect type in assignment (diff)
downloadkernel-qcow2-linux-96ff2c11c5e8f22f88ecb2fd18e8c0546e3936ed.tar.gz
kernel-qcow2-linux-96ff2c11c5e8f22f88ecb2fd18e8c0546e3936ed.tar.xz
kernel-qcow2-linux-96ff2c11c5e8f22f88ecb2fd18e8c0546e3936ed.zip
IB/i40iw: use setup_timer
Use setup_timer() instead of init_timer() to simplify the code. Signed-off-by: Geliang Tang <geliangtang@gmail.com> Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/hw/i40iw/i40iw_cm.c')
-rw-r--r--drivers/infiniband/hw/i40iw/i40iw_cm.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/infiniband/hw/i40iw/i40iw_cm.c b/drivers/infiniband/hw/i40iw/i40iw_cm.c
index 95a0586a4da8..f3bc01bce483 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);