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>
        }
        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;