staging: rdma: hfi1: Use setup_timer
authorBhaktipriya Shridhar <bhaktipriya96@gmail.com>
Mon, 22 Feb 2016 07:59:20 +0000 (13:29 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 12 Mar 2016 06:09:09 +0000 (22:09 -0800)
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>
drivers/staging/rdma/hfi1/verbs.c

index 09b8d41..1761686 100644 (file)
@@ -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