tty: serial: fsl_lpuart: Introduce lpuart_dma_shutdown()

Last steps of .shutdown() code are identical for lpuart and lpuart32
cases, so move it all into a standalone subroutine.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Cc: Stefan Agner <stefan@agner.ch>
Cc: Bhuvanchandra DV <bhuvanchandra.dv@toradex.com>
Cc: Chris Healy <cphealy@gmail.com>
Cc: Cory Tusar <cory.tusar@zii.aero>
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Slaby <jslaby@suse.com>
Cc: linux-imx@nxp.com
Cc: linux-serial@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Link: https://lore.kernel.org/r/20190729195226.8862-19-andrew.smirnov@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c
index 2597a87..8cf10d1 100644 (file)
--- a/drivers/tty/serial/fsl_lpuart.c
+++ b/drivers/tty/serial/fsl_lpuart.c
@@ -1547,6 +1547,22 @@ static int lpuart32_startup(struct uart_port *port)
        return 0;
 }
 
+static void lpuart_dma_shutdown(struct lpuart_port *sport)
+{
+       if (sport->lpuart_dma_rx_use) {
+               del_timer_sync(&sport->lpuart_timer);
+               lpuart_dma_rx_free(&sport->port);
+       }
+
+       if (sport->lpuart_dma_tx_use) {
+               if (wait_event_interruptible(sport->dma_wait,
+                       !sport->dma_tx_in_progress) != false) {
+                       sport->dma_tx_in_progress = false;
+                       dmaengine_terminate_all(sport->dma_tx_chan);
+               }
+       }
+}
+
 static void lpuart_shutdown(struct uart_port *port)
 {
        struct lpuart_port *sport = container_of(port, struct lpuart_port, port);
@@ -1563,18 +1579,7 @@ static void lpuart_shutdown(struct uart_port *port)
 
        spin_unlock_irqrestore(&port->lock, flags);
 
-       if (sport->lpuart_dma_rx_use) {
-               del_timer_sync(&sport->lpuart_timer);
-               lpuart_dma_rx_free(&sport->port);
-       }
-
-       if (sport->lpuart_dma_tx_use) {
-               if (wait_event_interruptible(sport->dma_wait,
-                       !sport->dma_tx_in_progress) != false) {
-                       sport->dma_tx_in_progress = false;
-                       dmaengine_terminate_all(sport->dma_tx_chan);
-               }
-       }
+       lpuart_dma_shutdown(sport);
 }
 
 static void lpuart32_shutdown(struct uart_port *port)
@@ -1594,18 +1599,7 @@ static void lpuart32_shutdown(struct uart_port *port)
 
        spin_unlock_irqrestore(&port->lock, flags);
 
-       if (sport->lpuart_dma_rx_use) {
-               del_timer_sync(&sport->lpuart_timer);
-               lpuart_dma_rx_free(&sport->port);
-       }
-
-       if (sport->lpuart_dma_tx_use) {
-               if (wait_event_interruptible(sport->dma_wait,
-                                            !sport->dma_tx_in_progress)) {
-                       sport->dma_tx_in_progress = false;
-                       dmaengine_terminate_all(sport->dma_tx_chan);
-               }
-       }
+       lpuart_dma_shutdown(sport);
 }
 
 static void