Commit 8682ab0e authored by Sherry Sun's avatar Sherry Sun Committed by Greg Kroah-Hartman
Browse files

tty: serial: fsl_lpuart: switch to new dmaengine_terminate_* API 



Convert dmaengine_terminate_all() calls to synchronous and asynchronous
versions where appropriate.

Signed-off-by: default avatarSherry Sun <sherry.sun@nxp.com>
Link: https://lore.kernel.org/r/20221123023619.30173-1-sherry.sun@nxp.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1a6ec673

drivers/tty/serial/fsl_lpuart.c

+4 −4
Original line number Diff line number Diff line
@@ -583,7 +583,7 @@ static void lpuart_flush_buffer(struct uart_port *port) 
				sport->dma_tx_nents, DMA_TO_DEVICE);

			sport->dma_tx_in_progress = false;

		}

		dmaengine_terminate_all(chan);

		dmaengine_terminate_async(chan);

	}



	if (lpuart_is_32(sport)) {
@@ -1327,7 +1327,7 @@ static void lpuart_dma_rx_free(struct uart_port *port) 
					struct lpuart_port, port);

	struct dma_chan *chan = sport->dma_rx_chan;



	dmaengine_terminate_all(chan);

	dmaengine_terminate_sync(chan);

	dma_unmap_sg(chan->device->dev, &sport->rx_sgl, 1, DMA_FROM_DEVICE);

	kfree(sport->rx_ring.buf);

	sport->rx_ring.tail = 0;
@@ -1757,7 +1757,7 @@ static void lpuart_dma_shutdown(struct lpuart_port *sport) 
		if (wait_event_interruptible_timeout(sport->dma_wait,

			!sport->dma_tx_in_progress, msecs_to_jiffies(300)) <= 0) {

			sport->dma_tx_in_progress = false;

			dmaengine_terminate_all(sport->dma_tx_chan);

			dmaengine_terminate_sync(sport->dma_tx_chan);

		}

		sport->lpuart_dma_tx_use = false;

	}
@@ -2968,7 +2968,7 @@ static int lpuart_suspend(struct device *dev) 
			}

			spin_unlock_irqrestore(&sport->port.lock, flags);

			sport->dma_tx_in_progress = false;

			dmaengine_terminate_all(sport->dma_tx_chan);

			dmaengine_terminate_sync(sport->dma_tx_chan);

		}

	} else if (pm_runtime_active(sport->port.dev)) {

		lpuart_disable_clks(sport);