diff options
| author | Doug Ledford <dledford@redhat.com> | 2017-10-18 19:12:09 +0200 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2017-10-18 19:12:09 +0200 |
| commit | 894b82c427d069a773e1d1417fe30bd31aa18801 (patch) | |
| tree | 8b361de9085f7891b4a673064b55f34b17bccb1e /drivers/infiniband/hw/hfi1/sdma.c | |
| parent | Merge branch 'for-next-early' into for-next (diff) | |
| parent | RDMA/cxgb4: Convert timers to use timer_setup() (diff) | |
| download | linux-894b82c427d069a773e1d1417fe30bd31aa18801.tar.xz linux-894b82c427d069a773e1d1417fe30bd31aa18801.zip | |
Merge branch 'timer_setup' into for-next
Conflicts:
drivers/infiniband/hw/cxgb4/cm.c
drivers/infiniband/hw/qib/qib_driver.c
drivers/infiniband/hw/qib/qib_mad.c
There were minor fixups needed in these files. Just minor context diffs
due to patches from independent sources touching the same basic area.
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/hw/hfi1/sdma.c')
| -rw-r--r-- | drivers/infiniband/hw/hfi1/sdma.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/infiniband/hw/hfi1/sdma.c b/drivers/infiniband/hw/hfi1/sdma.c index 3ba7f4ea4bc9..78716b829a28 100644 --- a/drivers/infiniband/hw/hfi1/sdma.c +++ b/drivers/infiniband/hw/hfi1/sdma.c @@ -491,10 +491,10 @@ static void sdma_err_progress_check_schedule(struct sdma_engine *sde) } } -static void sdma_err_progress_check(unsigned long data) +static void sdma_err_progress_check(struct timer_list *t) { unsigned index; - struct sdma_engine *sde = (struct sdma_engine *)data; + struct sdma_engine *sde = from_timer(sde, t, err_progress_check_timer); dd_dev_err(sde->dd, "SDE progress check event\n"); for (index = 0; index < sde->dd->num_sdma; index++) { @@ -1453,8 +1453,8 @@ int sdma_init(struct hfi1_devdata *dd, u8 port) sde->progress_check_head = 0; - setup_timer(&sde->err_progress_check_timer, - sdma_err_progress_check, (unsigned long)sde); + timer_setup(&sde->err_progress_check_timer, + sdma_err_progress_check, 0); sde->descq = dma_zalloc_coherent( &dd->pcidev->dev, |