From: Bhaktipriya Shridhar Date: Mon, 22 Feb 2016 07:59:20 +0000 (+0530) Subject: staging: rdma: hfi1: Use setup_timer X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e1af35bc7942483294e7f3cec818b64a66726853;p=linux-beck.git 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rdma/hfi1/verbs.c b/drivers/staging/rdma/hfi1/verbs.c index 09b8d412ee90..176168614b5a 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