diff options
| author |   Muhammad Falak R Wani <falakreyaz@gmail.com> | 2015-10-25 15:47:33 +0530 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-26 04:09:16 +0900 |
| commit | 567ae32ad87c8778965350b189a36d757293c82d (patch) | |
| tree | 7f63dc51d848eebd34ad6f30ba9d73769ccc8243 /drivers/staging/rdma/ipath/ipath_verbs.c | |
| parent | staging: ipath: ipath_driver: Use setup_timer (diff) | |
| download | linux-dev-567ae32ad87c8778965350b189a36d757293c82d.tar.xz linux-dev-567ae32ad87c8778965350b189a36d757293c82d.zip | |
staging: ipath: ipath_verbs: Use setup_timer
Use the timer API function setup_timer instead of init_timer, removing
the structure field assignments.
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/ipath/ipath_verbs.c')
| -rw-r--r-- | drivers/staging/rdma/ipath/ipath_verbs.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/rdma/ipath/ipath_verbs.c b/drivers/staging/rdma/ipath/ipath_verbs.c index ea3f21aa0b38..a2fb41bba117 100644 --- a/drivers/staging/rdma/ipath/ipath_verbs.c +++ b/drivers/staging/rdma/ipath/ipath_verbs.c @@ -1956,9 +1956,8 @@ static int enable_timer(struct ipath_devdata *dd) dd->ipath_gpio_mask); } - init_timer(&dd->verbs_timer); - dd->verbs_timer.function = __verbs_timer; - dd->verbs_timer.data = (unsigned long)dd; + setup_timer(&dd->verbs_timer, __verbs_timer, (unsigned long)dd); + dd->verbs_timer.expires = jiffies + 1; add_timer(&dd->verbs_timer); |