aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma/iop-adma.c
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2013-10-16 11:19:42 -0400
committerVinod Koul <vinod.koul@intel.com>2013-10-25 01:46:06 -0400
commit9f571502d8327db60af8e7dec39fafc3397cedd1 (patch)
tree86f48294d34c6002896dce596695d0eb83908140 /drivers/dma/iop-adma.c
parent2f16f802c3ac9df779096e56f43668e1c8e90c68 (diff)
dmaengine: iop: 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/iop-adma.c')
-rw-r--r--drivers/dma/iop-adma.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/dma/iop-adma.c b/drivers/dma/iop-adma.c
index dd8b44a56e5d..408fe6be15f4 100644
--- a/drivers/dma/iop-adma.c
+++ b/drivers/dma/iop-adma.c
@@ -864,7 +864,7 @@ static enum dma_status iop_adma_status(struct dma_chan *chan,
864 int ret; 864 int ret;
865 865
866 ret = dma_cookie_status(chan, cookie, txstate); 866 ret = dma_cookie_status(chan, cookie, txstate);
867 if (ret == DMA_SUCCESS) 867 if (ret == DMA_COMPLETE)
868 return ret; 868 return ret;
869 869
870 iop_adma_slot_cleanup(iop_chan); 870 iop_adma_slot_cleanup(iop_chan);
@@ -983,7 +983,7 @@ static int iop_adma_memcpy_self_test(struct iop_adma_device *device)
983 msleep(1); 983 msleep(1);
984 984
985 if (iop_adma_status(dma_chan, cookie, NULL) != 985 if (iop_adma_status(dma_chan, cookie, NULL) !=
986 DMA_SUCCESS) { 986 DMA_COMPLETE) {
987 dev_err(dma_chan->device->dev, 987 dev_err(dma_chan->device->dev,
988 "Self-test copy timed out, disabling\n"); 988 "Self-test copy timed out, disabling\n");
989 err = -ENODEV; 989 err = -ENODEV;
@@ -1083,7 +1083,7 @@ iop_adma_xor_val_self_test(struct iop_adma_device *device)
1083 msleep(8); 1083 msleep(8);
1084 1084
1085 if (iop_adma_status(dma_chan, cookie, NULL) != 1085 if (iop_adma_status(dma_chan, cookie, NULL) !=
1086 DMA_SUCCESS) { 1086 DMA_COMPLETE) {
1087 dev_err(dma_chan->device->dev, 1087 dev_err(dma_chan->device->dev,
1088 "Self-test xor timed out, disabling\n"); 1088 "Self-test xor timed out, disabling\n");
1089 err = -ENODEV; 1089 err = -ENODEV;
@@ -1129,7 +1129,7 @@ iop_adma_xor_val_self_test(struct iop_adma_device *device)
1129 iop_adma_issue_pending(dma_chan); 1129 iop_adma_issue_pending(dma_chan);
1130 msleep(8); 1130 msleep(8);
1131 1131
1132 if (iop_adma_status(dma_chan, cookie, NULL) != DMA_SUCCESS) { 1132 if (iop_adma_status(dma_chan, cookie, NULL) != DMA_COMPLETE) {
1133 dev_err(dma_chan->device->dev, 1133 dev_err(dma_chan->device->dev,
1134 "Self-test zero sum timed out, disabling\n"); 1134 "Self-test zero sum timed out, disabling\n");
1135 err = -ENODEV; 1135 err = -ENODEV;
@@ -1158,7 +1158,7 @@ iop_adma_xor_val_self_test(struct iop_adma_device *device)
1158 iop_adma_issue_pending(dma_chan); 1158 iop_adma_issue_pending(dma_chan);
1159 msleep(8); 1159 msleep(8);
1160 1160
1161 if (iop_adma_status(dma_chan, cookie, NULL) != DMA_SUCCESS) { 1161 if (iop_adma_status(dma_chan, cookie, NULL) != DMA_COMPLETE) {
1162 dev_err(dma_chan->device->dev, 1162 dev_err(dma_chan->device->dev,
1163 "Self-test non-zero sum timed out, disabling\n"); 1163 "Self-test non-zero sum timed out, disabling\n");
1164 err = -ENODEV; 1164 err = -ENODEV;
@@ -1254,7 +1254,7 @@ iop_adma_pq_zero_sum_self_test(struct iop_adma_device *device)
1254 msleep(8); 1254 msleep(8);
1255 1255
1256 if (iop_adma_status(dma_chan, cookie, NULL) != 1256 if (iop_adma_status(dma_chan, cookie, NULL) !=
1257 DMA_SUCCESS) { 1257 DMA_COMPLETE) {
1258 dev_err(dev, "Self-test pq timed out, disabling\n"); 1258 dev_err(dev, "Self-test pq timed out, disabling\n");
1259 err = -ENODEV; 1259 err = -ENODEV;
1260 goto free_resources; 1260 goto free_resources;
@@ -1291,7 +1291,7 @@ iop_adma_pq_zero_sum_self_test(struct iop_adma_device *device)
1291 msleep(8); 1291 msleep(8);
1292 1292
1293 if (iop_adma_status(dma_chan, cookie, NULL) != 1293 if (iop_adma_status(dma_chan, cookie, NULL) !=
1294 DMA_SUCCESS) { 1294 DMA_COMPLETE) {
1295 dev_err(dev, "Self-test pq-zero-sum timed out, disabling\n"); 1295 dev_err(dev, "Self-test pq-zero-sum timed out, disabling\n");
1296 err = -ENODEV; 1296 err = -ENODEV;
1297 goto free_resources; 1297 goto free_resources;
@@ -1323,7 +1323,7 @@ iop_adma_pq_zero_sum_self_test(struct iop_adma_device *device)
1323 msleep(8); 1323 msleep(8);
1324 1324
1325 if (iop_adma_status(dma_chan, cookie, NULL) != 1325 if (iop_adma_status(dma_chan, cookie, NULL) !=
1326 DMA_SUCCESS) { 1326 DMA_COMPLETE) {
1327 dev_err(dev, "Self-test !pq-zero-sum timed out, disabling\n"); 1327 dev_err(dev, "Self-test !pq-zero-sum timed out, disabling\n");
1328 err = -ENODEV; 1328 err = -ENODEV;
1329 goto free_resources; 1329 goto free_resources;