Skip to content

Commit

Permalink
spi: stm32: use dmaengine_terminate_{a}sync instead of _all
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Alain Volmat authored and Mark Brown committed Jun 15, 2023
1 parent 6f48655 commit 4f2b39d
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/spi/spi-stm32.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 4f2b39d

Please sign in to comment.