diff options
| author | Dave Jiang <dave.jiang@intel.com> | 2015-08-11 17:49:00 +0200 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2015-08-17 10:07:30 +0200 |
| commit | ef97bd0f59741ca1a555b69b8708f6601e35c3ed (patch) | |
| tree | 5563f79da5b08ca7db83dba59435732b4e60a9cf /drivers/dma/ioat/dma.c | |
| parent | dmaengine: ioatdma: removal of dma_v3.c and relevant ioat3 references (diff) | |
| download | linux-ef97bd0f59741ca1a555b69b8708f6601e35c3ed.tar.xz linux-ef97bd0f59741ca1a555b69b8708f6601e35c3ed.zip | |
dmanegine: ioatdma: remove function ptrs in ioatdma_device
Since we are a "single" device driver now we no longer require the function
pointers in ioatdma_device. Remove.
Signed-off-by: Dave Jiang <dave.jiang@intel.com>
Acked-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma/ioat/dma.c')
| -rw-r--r-- | drivers/dma/ioat/dma.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/dma/ioat/dma.c b/drivers/dma/ioat/dma.c index 2031bb4ad536..7435585dbbd6 100644 --- a/drivers/dma/ioat/dma.c +++ b/drivers/dma/ioat/dma.c @@ -121,7 +121,7 @@ void ioat_stop(struct ioatdma_chan *ioat_chan) tasklet_kill(&ioat_chan->cleanup_task); /* final cleanup now that everything is quiesced and can't re-arm */ - ioat_dma->cleanup_fn((unsigned long)&ioat_chan->dma_chan); + ioat_cleanup_event((unsigned long)&ioat_chan->dma_chan); } static void __ioat_issue_pending(struct ioatdma_chan *ioat_chan) @@ -520,10 +520,8 @@ int ioat_check_space_lock(struct ioatdma_chan *ioat_chan, int num_descs) */ if (time_is_before_jiffies(ioat_chan->timer.expires) && timer_pending(&ioat_chan->timer)) { - struct ioatdma_device *ioat_dma = ioat_chan->ioat_dma; - mod_timer(&ioat_chan->timer, jiffies + COMPLETION_TIMEOUT); - ioat_dma->timer_fn((unsigned long)ioat_chan); + ioat_timer_event((unsigned long)ioat_chan); } return -ENOMEM; |