Commit 9f571502 authored by Vinod Koul's avatar Vinod Koul
Browse files

dmaengine: iop: use DMA_COMPLETE for dma completion status 



Acked-by: default avatarDan Williams <dan.j.williams@intel.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 2f16f802

drivers/dma/iop-adma.c

+8 −8
Original line number Diff line number Diff line
@@ -864,7 +864,7 @@ static enum dma_status iop_adma_status(struct dma_chan *chan, 
	int ret;



	ret = dma_cookie_status(chan, cookie, txstate);

	if (ret == DMA_SUCCESS)

	if (ret == DMA_COMPLETE)

		return ret;



	iop_adma_slot_cleanup(iop_chan);
@@ -983,7 +983,7 @@ static int iop_adma_memcpy_self_test(struct iop_adma_device *device) 
	msleep(1);



	if (iop_adma_status(dma_chan, cookie, NULL) !=

			DMA_SUCCESS) {

			DMA_COMPLETE) {

		dev_err(dma_chan->device->dev,

			"Self-test copy timed out, disabling\n");

		err = -ENODEV;
@@ -1083,7 +1083,7 @@ iop_adma_xor_val_self_test(struct iop_adma_device *device) 
	msleep(8);



	if (iop_adma_status(dma_chan, cookie, NULL) !=

		DMA_SUCCESS) {

		DMA_COMPLETE) {

		dev_err(dma_chan->device->dev,

			"Self-test xor timed out, disabling\n");

		err = -ENODEV;
@@ -1129,7 +1129,7 @@ iop_adma_xor_val_self_test(struct iop_adma_device *device) 
	iop_adma_issue_pending(dma_chan);

	msleep(8);



	if (iop_adma_status(dma_chan, cookie, NULL) != DMA_SUCCESS) {

	if (iop_adma_status(dma_chan, cookie, NULL) != DMA_COMPLETE) {

		dev_err(dma_chan->device->dev,

			"Self-test zero sum timed out, disabling\n");

		err = -ENODEV;
@@ -1158,7 +1158,7 @@ iop_adma_xor_val_self_test(struct iop_adma_device *device) 
	iop_adma_issue_pending(dma_chan);

	msleep(8);



	if (iop_adma_status(dma_chan, cookie, NULL) != DMA_SUCCESS) {

	if (iop_adma_status(dma_chan, cookie, NULL) != DMA_COMPLETE) {

		dev_err(dma_chan->device->dev,

			"Self-test non-zero sum timed out, disabling\n");

		err = -ENODEV;
@@ -1254,7 +1254,7 @@ iop_adma_pq_zero_sum_self_test(struct iop_adma_device *device) 
	msleep(8);



	if (iop_adma_status(dma_chan, cookie, NULL) !=

		DMA_SUCCESS) {

		DMA_COMPLETE) {

		dev_err(dev, "Self-test pq timed out, disabling\n");

		err = -ENODEV;

		goto free_resources;
@@ -1291,7 +1291,7 @@ iop_adma_pq_zero_sum_self_test(struct iop_adma_device *device) 
	msleep(8);



	if (iop_adma_status(dma_chan, cookie, NULL) !=

		DMA_SUCCESS) {

		DMA_COMPLETE) {

		dev_err(dev, "Self-test pq-zero-sum timed out, disabling\n");

		err = -ENODEV;

		goto free_resources;
@@ -1323,7 +1323,7 @@ iop_adma_pq_zero_sum_self_test(struct iop_adma_device *device) 
	msleep(8);



	if (iop_adma_status(dma_chan, cookie, NULL) !=

		DMA_SUCCESS) {

		DMA_COMPLETE) {

		dev_err(dev, "Self-test !pq-zero-sum timed out, disabling\n");

		err = -ENODEV;

		goto free_resources;