From: Muhammad Falak R Wani Date: Sun, 25 Oct 2015 10:43:25 +0000 (+0530) Subject: staging: hfi1: sdma: Use setup_timer X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=daac731ba815ef0669d99db5a6a176bac567e156;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git staging: hfi1: 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/hfi1/sdma.c b/drivers/staging/rdma/hfi1/sdma.c index 63ab72102183..16d93fffe5de 100644 --- a/drivers/staging/rdma/hfi1/sdma.c +++ b/drivers/staging/rdma/hfi1/sdma.c @@ -1094,10 +1094,8 @@ int sdma_init(struct hfi1_devdata *dd, u8 port) sde->progress_check_head = 0; - init_timer(&sde->err_progress_check_timer); - sde->err_progress_check_timer.function = - sdma_err_progress_check; - sde->err_progress_check_timer.data = (unsigned long)sde; + setup_timer(&sde->err_progress_check_timer, + sdma_err_progress_check, (unsigned long)sde); sde->descq = dma_zalloc_coherent( &dd->pcidev->dev,