staging: rdma: hfi1: chip: Use setup_timer

Use the timer API function setup_timer instead of init_timer, removing
the structure field assignments.

<smpl>

@timer@
expression e1,e2,e3,fn_ptr;
@@
-init_timer(&e1);
+setup_timer(&e1, fn_ptr, e2);
... when != fn_ptr = e3
-e1.function = fn_ptr;
-e1.data = e2;

</smpl>

Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rdma/hfi1/chip.c b/drivers/staging/rdma/hfi1/chip.c
index 46ebc381a79244dcbc88b35dd84c30a4ec09bb27..c40395701b05947f35e3b35e13728ec81bfcee4f 100644 (file)
--- a/drivers/staging/rdma/hfi1/chip.c
+++ b/drivers/staging/rdma/hfi1/chip.c
@@ -2215,9 +2215,7 @@ static void update_rcverr_timer(unsigned long opaque)
 
 static int init_rcverr(struct hfi1_devdata *dd)
 {
-       init_timer(&dd->rcverr_timer);
-       dd->rcverr_timer.function = update_rcverr_timer;
-       dd->rcverr_timer.data = (unsigned long) dd;
+       setup_timer(&dd->rcverr_timer, update_rcverr_timer, (unsigned long)dd);
        /* Assume the hardware counter has been reset */
        dd->rcv_ovfl_cnt = 0;
        return mod_timer(&dd->rcverr_timer, jiffies + HZ * RCVERR_CHECK_TIME);
@@ -8156,9 +8154,8 @@ static int init_cntrs(struct hfi1_devdata *dd)
        struct hfi1_pportdata *ppd;
 
        /* set up the stats timer; the add_timer is done at the end */
-       init_timer(&dd->synth_stats_timer);
-       dd->synth_stats_timer.function = update_synth_timer;
-       dd->synth_stats_timer.data = (unsigned long) dd;
+       setup_timer(&dd->synth_stats_timer, update_synth_timer,
+                   (unsigned long)dd);
 
        /***********************/
        /* per device counters */