diff options
author | Muhammad Falak R Wani | 2015-10-25 11:43:23 +0100 |
---|---|---|
committer | Greg Kroah-Hartman | 2015-10-25 20:09:16 +0100 |
commit | 24523a94538ef500b867a2d4b2cb5bf72c8287a0 (patch) | |
tree | 55f5865242394c4fcb7a186ae4095330ae3a4a70 /drivers/staging/rdma/hfi1/chip.c | |
parent | Staging: mt29f_spinand: Prefer using the BIT macro (diff) | |
download | kernel-qcow2-linux-24523a94538ef500b867a2d4b2cb5bf72c8287a0.tar.gz kernel-qcow2-linux-24523a94538ef500b867a2d4b2cb5bf72c8287a0.tar.xz kernel-qcow2-linux-24523a94538ef500b867a2d4b2cb5bf72c8287a0.zip |
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>
Diffstat (limited to 'drivers/staging/rdma/hfi1/chip.c')
-rw-r--r-- | drivers/staging/rdma/hfi1/chip.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/staging/rdma/hfi1/chip.c b/drivers/staging/rdma/hfi1/chip.c index 46ebc381a792..c40395701b05 100644 --- 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 */ |