Skip to content

Commit e703ce4

Browse files
NXP-CarlosSongbroonie
authored andcommitted
spi: fsl-lpspi: replace dmaengine_terminate_all() with dmaengine_terminate_sync()
dmaengine_terminate_all() has been deprecated, so replace it with dmaengine_terminate_sync(). Fixes: 09c0446 ("spi: lpspi: add dma mode support") Cc: stable@vger.kernel.org Signed-off-by: Carlos Song <carlos.song@nxp.com> Link: https://patch.msgid.link/20260525062357.3191349-2-carlos.song@oss.nxp.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent e43ffb6 commit e703ce4

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

drivers/spi/spi-fsl-lpspi.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,7 @@ static int fsl_lpspi_dma_transfer(struct spi_controller *controller,
647647
tx->sgl, tx->nents, DMA_MEM_TO_DEV,
648648
DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
649649
if (!desc_tx) {
650-
dmaengine_terminate_all(controller->dma_tx);
650+
dmaengine_terminate_sync(controller->dma_tx);
651651
return -EINVAL;
652652
}
653653

@@ -668,8 +668,8 @@ static int fsl_lpspi_dma_transfer(struct spi_controller *controller,
668668
transfer_timeout);
669669
if (!time_left) {
670670
dev_err(fsl_lpspi->dev, "I/O Error in DMA TX\n");
671-
dmaengine_terminate_all(controller->dma_tx);
672-
dmaengine_terminate_all(controller->dma_rx);
671+
dmaengine_terminate_sync(controller->dma_tx);
672+
dmaengine_terminate_sync(controller->dma_rx);
673673
fsl_lpspi_reset(fsl_lpspi);
674674
return -ETIMEDOUT;
675675
}
@@ -678,8 +678,8 @@ static int fsl_lpspi_dma_transfer(struct spi_controller *controller,
678678
transfer_timeout);
679679
if (!time_left) {
680680
dev_err(fsl_lpspi->dev, "I/O Error in DMA RX\n");
681-
dmaengine_terminate_all(controller->dma_tx);
682-
dmaengine_terminate_all(controller->dma_rx);
681+
dmaengine_terminate_sync(controller->dma_tx);
682+
dmaengine_terminate_sync(controller->dma_rx);
683683
fsl_lpspi_reset(fsl_lpspi);
684684
return -ETIMEDOUT;
685685
}
@@ -688,8 +688,8 @@ static int fsl_lpspi_dma_transfer(struct spi_controller *controller,
688688
fsl_lpspi->target_aborted) {
689689
dev_dbg(fsl_lpspi->dev,
690690
"I/O Error in DMA TX interrupted\n");
691-
dmaengine_terminate_all(controller->dma_tx);
692-
dmaengine_terminate_all(controller->dma_rx);
691+
dmaengine_terminate_sync(controller->dma_tx);
692+
dmaengine_terminate_sync(controller->dma_rx);
693693
fsl_lpspi_reset(fsl_lpspi);
694694
return -EINTR;
695695
}
@@ -698,8 +698,8 @@ static int fsl_lpspi_dma_transfer(struct spi_controller *controller,
698698
fsl_lpspi->target_aborted) {
699699
dev_dbg(fsl_lpspi->dev,
700700
"I/O Error in DMA RX interrupted\n");
701-
dmaengine_terminate_all(controller->dma_tx);
702-
dmaengine_terminate_all(controller->dma_rx);
701+
dmaengine_terminate_sync(controller->dma_tx);
702+
dmaengine_terminate_sync(controller->dma_rx);
703703
fsl_lpspi_reset(fsl_lpspi);
704704
return -EINTR;
705705
}

0 commit comments

Comments
 (0)