spi: stm32: use dmaengine_terminate_{a}sync instead of _all
authorAlain Volmat <alain.volmat@foss.st.com>
Thu, 15 Jun 2023 07:58:13 +0000 (09:58 +0200)
committerMark Brown <broonie@kernel.org>
Thu, 15 Jun 2023 11:09:31 +0000 (12:09 +0100)
Avoid usage of deprecated dmaengine_terminate_all and use
dmaengine_terminate_sync and dmaengine_terminate_async instead.

Signed-off-by: Alain Volmat <alain.volmat@foss.st.com>
Signed-off-by: Valentin Caron <valentin.caron@foss.st.com>
Link: https://lore.kernel.org/r/20230615075815.310261-3-valentin.caron@foss.st.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-stm32.c

index 5d9439ae1c09eb5687a71114b867f16f52fb5e33..82fbd20e8a96be9ddf28a753e9226b78a1a0a862 100644 (file)
@@ -657,9 +657,9 @@ static void stm32f4_spi_disable(struct stm32_spi *spi)
        }
 
        if (spi->cur_usedma && spi->dma_tx)
-               dmaengine_terminate_all(spi->dma_tx);
+               dmaengine_terminate_async(spi->dma_tx);
        if (spi->cur_usedma && spi->dma_rx)
-               dmaengine_terminate_all(spi->dma_rx);
+               dmaengine_terminate_async(spi->dma_rx);
 
        stm32_spi_clr_bits(spi, STM32F4_SPI_CR1, STM32F4_SPI_CR1_SPE);
 
@@ -696,9 +696,9 @@ static void stm32h7_spi_disable(struct stm32_spi *spi)
        }
 
        if (spi->cur_usedma && spi->dma_tx)
-               dmaengine_terminate_all(spi->dma_tx);
+               dmaengine_terminate_async(spi->dma_tx);
        if (spi->cur_usedma && spi->dma_rx)
-               dmaengine_terminate_all(spi->dma_rx);
+               dmaengine_terminate_async(spi->dma_rx);
 
        stm32_spi_clr_bits(spi, STM32H7_SPI_CR1, STM32H7_SPI_CR1_SPE);
 
@@ -1302,7 +1302,7 @@ static int stm32_spi_transfer_one_dma(struct stm32_spi *spi,
 
 dma_submit_error:
        if (spi->dma_rx)
-               dmaengine_terminate_all(spi->dma_rx);
+               dmaengine_terminate_sync(spi->dma_rx);
 
 dma_desc_error:
        stm32_spi_clr_bits(spi, spi->cfg->regs->dma_rx_en.reg,