diff options
Diffstat (limited to 'drivers/dma/ioat/dma.c')
-rw-r--r-- | drivers/dma/ioat/dma.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/dma/ioat/dma.c b/drivers/dma/ioat/dma.c index 3e5a8005c62b..c9213ead4a26 100644 --- a/drivers/dma/ioat/dma.c +++ b/drivers/dma/ioat/dma.c | |||
@@ -727,18 +727,18 @@ static void ioat1_timer_event(unsigned long data) | |||
727 | } | 727 | } |
728 | 728 | ||
729 | enum dma_status | 729 | enum dma_status |
730 | ioat_is_dma_complete(struct dma_chan *c, dma_cookie_t cookie, | 730 | ioat_dma_tx_status(struct dma_chan *c, dma_cookie_t cookie, |
731 | dma_cookie_t *done, dma_cookie_t *used) | 731 | struct dma_tx_state *txstate) |
732 | { | 732 | { |
733 | struct ioat_chan_common *chan = to_chan_common(c); | 733 | struct ioat_chan_common *chan = to_chan_common(c); |
734 | struct ioatdma_device *device = chan->device; | 734 | struct ioatdma_device *device = chan->device; |
735 | 735 | ||
736 | if (ioat_is_complete(c, cookie, done, used) == DMA_SUCCESS) | 736 | if (ioat_tx_status(c, cookie, txstate) == DMA_SUCCESS) |
737 | return DMA_SUCCESS; | 737 | return DMA_SUCCESS; |
738 | 738 | ||
739 | device->cleanup_fn((unsigned long) c); | 739 | device->cleanup_fn((unsigned long) c); |
740 | 740 | ||
741 | return ioat_is_complete(c, cookie, done, used); | 741 | return ioat_tx_status(c, cookie, txstate); |
742 | } | 742 | } |
743 | 743 | ||
744 | static void ioat1_dma_start_null_desc(struct ioat_dma_chan *ioat) | 744 | static void ioat1_dma_start_null_desc(struct ioat_dma_chan *ioat) |
@@ -858,7 +858,7 @@ int __devinit ioat_dma_self_test(struct ioatdma_device *device) | |||
858 | tmo = wait_for_completion_timeout(&cmp, msecs_to_jiffies(3000)); | 858 | tmo = wait_for_completion_timeout(&cmp, msecs_to_jiffies(3000)); |
859 | 859 | ||
860 | if (tmo == 0 || | 860 | if (tmo == 0 || |
861 | dma->device_is_tx_complete(dma_chan, cookie, NULL, NULL) | 861 | dma->device_tx_status(dma_chan, cookie, NULL) |
862 | != DMA_SUCCESS) { | 862 | != DMA_SUCCESS) { |
863 | dev_err(dev, "Self-test copy timed out, disabling\n"); | 863 | dev_err(dev, "Self-test copy timed out, disabling\n"); |
864 | err = -ENODEV; | 864 | err = -ENODEV; |
@@ -1199,7 +1199,7 @@ int __devinit ioat1_dma_probe(struct ioatdma_device *device, int dca) | |||
1199 | dma->device_issue_pending = ioat1_dma_memcpy_issue_pending; | 1199 | dma->device_issue_pending = ioat1_dma_memcpy_issue_pending; |
1200 | dma->device_alloc_chan_resources = ioat1_dma_alloc_chan_resources; | 1200 | dma->device_alloc_chan_resources = ioat1_dma_alloc_chan_resources; |
1201 | dma->device_free_chan_resources = ioat1_dma_free_chan_resources; | 1201 | dma->device_free_chan_resources = ioat1_dma_free_chan_resources; |
1202 | dma->device_is_tx_complete = ioat_is_dma_complete; | 1202 | dma->device_tx_status = ioat_dma_tx_status; |
1203 | 1203 | ||
1204 | err = ioat_probe(device); | 1204 | err = ioat_probe(device); |
1205 | if (err) | 1205 | if (err) |