staging: hfi1: sdma: Use setup_timer

[mirror_ubuntu-artful-kernel.git] / drivers / staging / rdma / hfi1 / sdma.c

diff --git a/drivers/staging/rdma/hfi1/sdma.c b/drivers/staging/rdma/hfi1/sdma.c
index aecd1a74741c656897f9f4ba367892c2a214e7fa..16d93fffe5def8f718326caeda0baf66d9d63e90 100644 (file)
--- a/drivers/staging/rdma/hfi1/sdma.c
+++ b/drivers/staging/rdma/hfi1/sdma.c
@@ -741,6 +741,7 @@ u16 sdma_get_descq_cnt(void)
                return SDMA_DESCQ_CNT;
        return count;
 }
+
 /**
  * sdma_select_engine_vl() - select sdma engine
  * @dd: devdata
@@ -966,10 +967,7 @@ static void sdma_clean(struct hfi1_devdata *dd, size_t num_engines)
                        sde->descq = NULL;
                        sde->descq_phys = 0;
                }
-               if (is_vmalloc_addr(sde->tx_ring))
-                       vfree(sde->tx_ring);
-               else
-                       kfree(sde->tx_ring);
+               kvfree(sde->tx_ring);
                sde->tx_ring = NULL;
        }
        spin_lock_irq(&dd->sde_map_lock);
@@ -1096,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,