staging: ipath: ipath_sdma: 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>

diff --git a/drivers/staging/rdma/ipath/ipath_sdma.c b/drivers/staging/rdma/ipath/ipath_sdma.c
index 17a517766ad27b822ba1b77780601a44f7219a7e..1ffc06abf9da5c56f25cb9a183d5384635713e99 100644 (file)
--- a/drivers/staging/rdma/ipath/ipath_sdma.c
+++ b/drivers/staging/rdma/ipath/ipath_sdma.c
@@ -400,9 +400,9 @@ static int alloc_sdma(struct ipath_devdata *dd)
        }
        dd->ipath_sdma_head_dma[0] = 0;
 
-       init_timer(&dd->ipath_sdma_vl15_timer);
-       dd->ipath_sdma_vl15_timer.function = vl15_watchdog_timeout;
-       dd->ipath_sdma_vl15_timer.data = (unsigned long)dd;
+       setup_timer(&dd->ipath_sdma_vl15_timer, vl15_watchdog_timeout,
+                       (unsigned long)dd);
+
        atomic_set(&dd->ipath_sdma_vl15_count, 0);
 
        goto done;