summaryrefslogtreecommitdiff
path: root/drivers/staging/rdma
diff options
context:
space:
mode:
authorMuhammad Falak R Wani <falakreyaz@gmail.com>2015-10-25 15:47:30 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-10-26 04:09:16 +0900
commit6149e2e4447c86eaf3c1870694dfe4b2bcd8ec0d (patch)
treebf2c07f1862a309392c2eda0ac8eb4d4e3564569 /drivers/staging/rdma
parent575ff198f5a3981e8d9fb54e61876f9082ca3bd7 (diff)
staging: ipath: ipath_driver: Use setup_timer
Use the timer API function setup_timer instead of init_timer, removing the structure field assignments. The simplified semantic patch used is :- <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')
-rw-r--r--drivers/staging/rdma/ipath/ipath_driver.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/staging/rdma/ipath/ipath_driver.c b/drivers/staging/rdma/ipath/ipath_driver.c
index dfcfaa5e811e..2ab22f98e3ba 100644
--- a/drivers/staging/rdma/ipath/ipath_driver.c
+++ b/drivers/staging/rdma/ipath/ipath_driver.c
@@ -2306,10 +2306,9 @@ void ipath_set_led_override(struct ipath_devdata *dd, unsigned int val)
*/
if (atomic_inc_return(&dd->ipath_led_override_timer_active) == 1) {
/* Need to start timer */
- init_timer(&dd->ipath_led_override_timer);
- dd->ipath_led_override_timer.function =
- ipath_run_led_override;
- dd->ipath_led_override_timer.data = (unsigned long) dd;
+ setup_timer(&dd->ipath_led_override_timer,
+ ipath_run_led_override, (unsigned long)dd);
+
dd->ipath_led_override_timer.expires = jiffies + 1;
add_timer(&dd->ipath_led_override_timer);
} else