Unverified Commit 29176edd authored by Wolfram Sang's avatar Wolfram Sang Committed by Mark Brown
Browse files

spi: spi-rspi: : use proper DMAENGINE API for termination 



dmaengine_terminate_all() is deprecated in favor of explicitly saying if
it should be sync or async. Here, we want dmaengine_terminate_sync()
because there is no other synchronization code in the driver to handle
an async case.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/20210623095843.3228-2-wsa+renesas@sang-engineering.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent d90609a4

drivers/spi/spi-rspi.c

+3 −3
Original line number Diff line number Diff line
@@ -618,9 +618,9 @@ static int rspi_dma_transfer(struct rspi_data *rspi, struct sg_table *tx, 
			ret = -ETIMEDOUT;

		}

		if (tx)

			dmaengine_terminate_all(rspi->ctlr->dma_tx);

			dmaengine_terminate_sync(rspi->ctlr->dma_tx);

		if (rx)

			dmaengine_terminate_all(rspi->ctlr->dma_rx);

			dmaengine_terminate_sync(rspi->ctlr->dma_rx);

	}



	rspi_disable_irq(rspi, irq_mask);
@@ -634,7 +634,7 @@ static int rspi_dma_transfer(struct rspi_data *rspi, struct sg_table *tx, 


no_dma_tx:

	if (rx)

		dmaengine_terminate_all(rspi->ctlr->dma_rx);

		dmaengine_terminate_sync(rspi->ctlr->dma_rx);

no_dma_rx:

	if (ret == -EAGAIN) {

		dev_warn_once(&rspi->ctlr->dev,