Commit 2f16f802 authored by Vinod Koul's avatar Vinod Koul
Browse files

dmaengine: ioat: 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 94e4c120

drivers/dma/ioat/dma.c

+2 −2
Original line number Diff line number Diff line
@@ -733,7 +733,7 @@ ioat_dma_tx_status(struct dma_chan *c, dma_cookie_t cookie, 
	enum dma_status ret;



	ret = dma_cookie_status(c, cookie, txstate);

	if (ret == DMA_SUCCESS)

	if (ret == DMA_COMPLETE)

		return ret;



	device->cleanup_fn((unsigned long) c);
@@ -859,7 +859,7 @@ int ioat_dma_self_test(struct ioatdma_device *device) 


	if (tmo == 0 ||

	    dma->device_tx_status(dma_chan, cookie, NULL)

					!= DMA_SUCCESS) {

					!= DMA_COMPLETE) {

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

		err = -ENODEV;

		goto unmap_dma;

drivers/dma/ioat/dma_v3.c

+4 −4
Original line number Diff line number Diff line
@@ -807,7 +807,7 @@ ioat3_tx_status(struct dma_chan *c, dma_cookie_t cookie, 
	enum dma_status ret;



	ret = dma_cookie_status(c, cookie, txstate);

	if (ret == DMA_SUCCESS)

	if (ret == DMA_COMPLETE)

		return ret;



	ioat3_cleanup(ioat);
@@ -1468,7 +1468,7 @@ static int ioat_xor_val_self_test(struct ioatdma_device *device) 


	tmo = wait_for_completion_timeout(&cmp, msecs_to_jiffies(3000));



	if (dma->device_tx_status(dma_chan, cookie, NULL) != DMA_SUCCESS) {

	if (dma->device_tx_status(dma_chan, cookie, NULL) != DMA_COMPLETE) {

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

		err = -ENODEV;

		goto dma_unmap;
@@ -1530,7 +1530,7 @@ static int ioat_xor_val_self_test(struct ioatdma_device *device) 


	tmo = wait_for_completion_timeout(&cmp, msecs_to_jiffies(3000));



	if (dma->device_tx_status(dma_chan, cookie, NULL) != DMA_SUCCESS) {

	if (dma->device_tx_status(dma_chan, cookie, NULL) != DMA_COMPLETE) {

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

		err = -ENODEV;

		goto dma_unmap;
@@ -1577,7 +1577,7 @@ static int ioat_xor_val_self_test(struct ioatdma_device *device) 


	tmo = wait_for_completion_timeout(&cmp, msecs_to_jiffies(3000));



	if (dma->device_tx_status(dma_chan, cookie, NULL) != DMA_SUCCESS) {

	if (dma->device_tx_status(dma_chan, cookie, NULL) != DMA_COMPLETE) {

		dev_err(dev, "Self-test 2nd validate timed out\n");

		err = -ENODEV;

		goto dma_unmap;