From: Muhammad Falak R Wani Date: Sun, 25 Oct 2015 10:17:32 +0000 (+0530) Subject: staging: ipath: ipath_sdma: Use setup_timer X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7cc918a8565e2a7f6df78cb46777091a862fee54;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rdma/ipath/ipath_sdma.c b/drivers/staging/rdma/ipath/ipath_sdma.c index 17a517766ad2..1ffc06abf9da 100644 --- 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;