Skip to content

Commit 4f2b39d

Browse files
Alain Volmatbroonie
authored andcommitted
spi: stm32: use dmaengine_terminate_{a}sync instead of _all
Avoid usage of deprecated dmaengine_terminate_all and use dmaengine_terminate_sync and dmaengine_terminate_async instead. Signed-off-by: Alain Volmat <[email protected]> Signed-off-by: Valentin Caron <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 6f48655 commit 4f2b39d

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

drivers/spi/spi-stm32.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -657,9 +657,9 @@ static void stm32f4_spi_disable(struct stm32_spi *spi)
657657
}
658658

659659
if (spi->cur_usedma && spi->dma_tx)
660-
dmaengine_terminate_all(spi->dma_tx);
660+
dmaengine_terminate_async(spi->dma_tx);
661661
if (spi->cur_usedma && spi->dma_rx)
662-
dmaengine_terminate_all(spi->dma_rx);
662+
dmaengine_terminate_async(spi->dma_rx);
663663

664664
stm32_spi_clr_bits(spi, STM32F4_SPI_CR1, STM32F4_SPI_CR1_SPE);
665665

@@ -696,9 +696,9 @@ static void stm32h7_spi_disable(struct stm32_spi *spi)
696696
}
697697

698698
if (spi->cur_usedma && spi->dma_tx)
699-
dmaengine_terminate_all(spi->dma_tx);
699+
dmaengine_terminate_async(spi->dma_tx);
700700
if (spi->cur_usedma && spi->dma_rx)
701-
dmaengine_terminate_all(spi->dma_rx);
701+
dmaengine_terminate_async(spi->dma_rx);
702702

703703
stm32_spi_clr_bits(spi, STM32H7_SPI_CR1, STM32H7_SPI_CR1_SPE);
704704

@@ -1302,7 +1302,7 @@ static int stm32_spi_transfer_one_dma(struct stm32_spi *spi,
13021302

13031303
dma_submit_error:
13041304
if (spi->dma_rx)
1305-
dmaengine_terminate_all(spi->dma_rx);
1305+
dmaengine_terminate_sync(spi->dma_rx);
13061306

13071307
dma_desc_error:
13081308
stm32_spi_clr_bits(spi, spi->cfg->regs->dma_rx_en.reg,

0 commit comments

Comments
 (0)