summaryrefslogtreecommitdiff
path: root/drivers/staging
diff options
context:
space:
mode:
authorBhaktipriya Shridhar <bhaktipriya96@gmail.com>2016-02-22 07:59:20 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-03-12 06:09:09 (GMT)
commite1af35bc7942483294e7f3cec818b64a66726853 (patch)
tree68737734f160ab513ce2a617ea212210abaf073f /drivers/staging
parent995ae68c30a5d4947f7685f29b1e69b436ddcdb3 (diff)
downloadlinux-e1af35bc7942483294e7f3cec818b64a66726853.tar.xz
staging: rdma: hfi1: Use setup_timer
The function setup_timer combines the initialization of a timer with the initialization of the timer's function and data fields. The multiline code for timer initialization is now replaced with function setup_timer. This was done with Coccinelle. @@ expression e1, e2, e3; type T; @@ - init_timer(&e1); ... ( - e1.function = e2; ... - e1.data = (T)e3; + setup_timer(&e1, e2, (T)e3); | - e1.data = (T)e3; ... - e1.function = e2; + setup_timer(&e1, e2, (T)e3); | - e1.function = e2; + setup_timer(&e1, e2, 0); ) Signed-off-by: Bhaktipriya Shridhar <bhaktipriya96@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/rdma/hfi1/verbs.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/staging/rdma/hfi1/verbs.c b/drivers/staging/rdma/hfi1/verbs.c
index 09b8d41..1761686 100644
--- a/drivers/staging/rdma/hfi1/verbs.c
+++ b/drivers/staging/rdma/hfi1/verbs.c
@@ -1926,9 +1926,7 @@ int hfi1_register_ib_device(struct hfi1_devdata *dd)
spin_lock_init(&dev->n_qps_lock);
spin_lock_init(&dev->n_srqs_lock);
spin_lock_init(&dev->n_mcast_grps_lock);
- init_timer(&dev->mem_timer);
- dev->mem_timer.function = mem_timer;
- dev->mem_timer.data = (unsigned long) dev;
+ setup_timer(&dev->mem_timer, mem_timer, (unsigned long)dev);
/*
* The top hfi1_lkey_table_size bits are used to index the