tty: serial: fsl_lpuart: move the lpuart32_int() below
authorSherry Sun <sherry.sun@nxp.com>
Mon, 10 Jul 2023 01:38:56 +0000 (09:38 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 25 Jul 2023 18:24:26 +0000 (20:24 +0200)
Move the lpuart32_int() below lpuart_copy_rx_to_tty(), this is a
preparation patch for the next patch to avoid the function declaration,
no actual functional changes.

Signed-off-by: Sherry Sun <sherry.sun@nxp.com>
Link: https://lore.kernel.org/r/20230710013857.7396-2-sherry.sun@nxp.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/fsl_lpuart.c

index e1a8d541571841e2efa1912484186c38a6dd577e..159a2de509f37abaab6389195ff07d4d920d0aba 100644 (file)
@@ -1064,26 +1064,6 @@ static irqreturn_t lpuart_int(int irq, void *dev_id)
        return IRQ_HANDLED;
 }
 
-static irqreturn_t lpuart32_int(int irq, void *dev_id)
-{
-       struct lpuart_port *sport = dev_id;
-       unsigned long sts, rxcount;
-
-       sts = lpuart32_read(&sport->port, UARTSTAT);
-       rxcount = lpuart32_read(&sport->port, UARTWATER);
-       rxcount = rxcount >> UARTWATER_RXCNT_OFF;
-
-       if ((sts & UARTSTAT_RDRF || rxcount > 0) && !sport->lpuart_dma_rx_use)
-               lpuart32_rxint(sport);
-
-       if ((sts & UARTSTAT_TDRE) && !sport->lpuart_dma_tx_use)
-               lpuart32_txint(sport);
-
-       lpuart32_write(&sport->port, sts, UARTSTAT);
-       return IRQ_HANDLED;
-}
-
-
 static inline void lpuart_handle_sysrq_chars(struct uart_port *port,
                                             unsigned char *p, int count)
 {
@@ -1276,6 +1256,25 @@ static void lpuart_dma_rx_complete(void *arg)
        lpuart_copy_rx_to_tty(sport);
 }
 
+static irqreturn_t lpuart32_int(int irq, void *dev_id)
+{
+       struct lpuart_port *sport = dev_id;
+       unsigned long sts, rxcount;
+
+       sts = lpuart32_read(&sport->port, UARTSTAT);
+       rxcount = lpuart32_read(&sport->port, UARTWATER);
+       rxcount = rxcount >> UARTWATER_RXCNT_OFF;
+
+       if ((sts & UARTSTAT_RDRF || rxcount > 0) && !sport->lpuart_dma_rx_use)
+               lpuart32_rxint(sport);
+
+       if ((sts & UARTSTAT_TDRE) && !sport->lpuart_dma_tx_use)
+               lpuart32_txint(sport);
+
+       lpuart32_write(&sport->port, sts, UARTSTAT);
+       return IRQ_HANDLED;
+}
+
 /*
  * Timer function to simulate the hardware EOP (End Of Package) event.
  * The timer callback is to check for new RX data and copy to TTY buffer.