aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma/ioat
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2013-10-16 11:18:52 -0400
committerVinod Koul <vinod.koul@intel.com>2013-10-25 01:46:05 -0400
commit2f16f802c3ac9df779096e56f43668e1c8e90c68 (patch)
treeebb187da2da552a70f03aa84b9681636d499cd7a /drivers/dma/ioat
parent94e4c120c7661ff028be6337b05037bb1f153855 (diff)
dmaengine: ioat: use DMA_COMPLETE for dma completion status
Acked-by: Dan Williams <dan.j.williams@intel.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma/ioat')
-rw-r--r--drivers/dma/ioat/dma.c4
-rw-r--r--drivers/dma/ioat/dma_v3.c8
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/dma/ioat/dma.c b/drivers/dma/ioat/dma.c
index 5ff6fc1819dc..a0f0fce5a84e 100644
--- a/drivers/dma/ioat/dma.c
+++ b/drivers/dma/ioat/dma.c
@@ -733,7 +733,7 @@ ioat_dma_tx_status(struct dma_chan *c, dma_cookie_t cookie,
733 enum dma_status ret; 733 enum dma_status ret;
734 734
735 ret = dma_cookie_status(c, cookie, txstate); 735 ret = dma_cookie_status(c, cookie, txstate);
736 if (ret == DMA_SUCCESS) 736 if (ret == DMA_COMPLETE)
737 return ret; 737 return ret;
738 738
739 device->cleanup_fn((unsigned long) c); 739 device->cleanup_fn((unsigned long) c);
@@ -859,7 +859,7 @@ int ioat_dma_self_test(struct ioatdma_device *device)
859 859
860 if (tmo == 0 || 860 if (tmo == 0 ||
861 dma->device_tx_status(dma_chan, cookie, NULL) 861 dma->device_tx_status(dma_chan, cookie, NULL)
862 != DMA_SUCCESS) { 862 != DMA_COMPLETE) {
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;
865 goto unmap_dma; 865 goto unmap_dma;
diff --git a/drivers/dma/ioat/dma_v3.c b/drivers/dma/ioat/dma_v3.c
index d8ececaf1b57..806b4ce5e38c 100644
--- a/drivers/dma/ioat/dma_v3.c
+++ b/drivers/dma/ioat/dma_v3.c
@@ -807,7 +807,7 @@ ioat3_tx_status(struct dma_chan *c, dma_cookie_t cookie,
807 enum dma_status ret; 807 enum dma_status ret;
808 808
809 ret = dma_cookie_status(c, cookie, txstate); 809 ret = dma_cookie_status(c, cookie, txstate);
810 if (ret == DMA_SUCCESS) 810 if (ret == DMA_COMPLETE)
811 return ret; 811 return ret;
812 812
813 ioat3_cleanup(ioat); 813 ioat3_cleanup(ioat);
@@ -1468,7 +1468,7 @@ static int ioat_xor_val_self_test(struct ioatdma_device *device)
1468 1468
1469 tmo = wait_for_completion_timeout(&cmp, msecs_to_jiffies(3000)); 1469 tmo = wait_for_completion_timeout(&cmp, msecs_to_jiffies(3000));
1470 1470
1471 if (dma->device_tx_status(dma_chan, cookie, NULL) != DMA_SUCCESS) { 1471 if (dma->device_tx_status(dma_chan, cookie, NULL) != DMA_COMPLETE) {
1472 dev_err(dev, "Self-test xor timed out\n"); 1472 dev_err(dev, "Self-test xor timed out\n");
1473 err = -ENODEV; 1473 err = -ENODEV;
1474 goto dma_unmap; 1474 goto dma_unmap;
@@ -1530,7 +1530,7 @@ static int ioat_xor_val_self_test(struct ioatdma_device *device)
1530 1530
1531 tmo = wait_for_completion_timeout(&cmp, msecs_to_jiffies(3000)); 1531 tmo = wait_for_completion_timeout(&cmp, msecs_to_jiffies(3000));
1532 1532
1533 if (dma->device_tx_status(dma_chan, cookie, NULL) != DMA_SUCCESS) { 1533 if (dma->device_tx_status(dma_chan, cookie, NULL) != DMA_COMPLETE) {
1534 dev_err(dev, "Self-test validate timed out\n"); 1534 dev_err(dev, "Self-test validate timed out\n");
1535 err = -ENODEV; 1535 err = -ENODEV;
1536 goto dma_unmap; 1536 goto dma_unmap;
@@ -1577,7 +1577,7 @@ static int ioat_xor_val_self_test(struct ioatdma_device *device)
1577 1577
1578 tmo = wait_for_completion_timeout(&cmp, msecs_to_jiffies(3000)); 1578 tmo = wait_for_completion_timeout(&cmp, msecs_to_jiffies(3000));
1579 1579
1580 if (dma->device_tx_status(dma_chan, cookie, NULL) != DMA_SUCCESS) { 1580 if (dma->device_tx_status(dma_chan, cookie, NULL) != DMA_COMPLETE) {
1581 dev_err(dev, "Self-test 2nd validate timed out\n"); 1581 dev_err(dev, "Self-test 2nd validate timed out\n");
1582 err = -ENODEV; 1582 err = -ENODEV;
1583 goto dma_unmap; 1583 goto dma_unmap;