tty: serial: fsl_lpuart: Introduce lpuart*_setup_watermark_enable()

Most users of lpuart*_setup_watermark() enable identical set of flags
right after the call, so combine those two action into a subroutine
and make use of it.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Cc: Stefan Agner <stefan@agner.ch>
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/20190805185701.22863-5-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 1286daa..fb9961e 100644 (file)
--- a/drivers/tty/serial/fsl_lpuart.c
+++ b/drivers/tty/serial/fsl_lpuart.c
@@ -1403,6 +1403,17 @@ static void lpuart_setup_watermark(struct lpuart_port *sport)
        writeb(cr2_saved, sport->port.membase + UARTCR2);
 }
 
+static void lpuart_setup_watermark_enable(struct lpuart_port *sport)
+{
+       unsigned char cr2;
+
+       lpuart_setup_watermark(sport);
+
+       cr2 = readb(sport->port.membase + UARTCR2);
+       cr2 |= UARTCR2_RIE | UARTCR2_TIE | UARTCR2_RE | UARTCR2_TE;
+       writeb(cr2, sport->port.membase + UARTCR2);
+}
+
 static void lpuart32_setup_watermark(struct lpuart_port *sport)
 {
        unsigned long val, ctrl;
@@ -1428,6 +1439,17 @@ static void lpuart32_setup_watermark(struct lpuart_port *sport)
        lpuart32_write(&sport->port, ctrl_saved, UARTCTRL);
 }
 
+static void lpuart32_setup_watermark_enable(struct lpuart_port *sport)
+{
+       u32 temp;
+
+       lpuart32_setup_watermark(sport);
+
+       temp = lpuart32_read(&sport->port, UARTCTRL);
+       temp |= UARTCTRL_RE | UARTCTRL_TE | UARTCTRL_ILIE;
+       lpuart32_write(&sport->port, temp, UARTCTRL);
+}
+
 static void rx_dma_timer_init(struct lpuart_port *sport)
 {
        timer_setup(&sport->lpuart_timer, lpuart_timer_func, 0);
@@ -1488,11 +1510,7 @@ static int lpuart_startup(struct uart_port *port)
 
        spin_lock_irqsave(&sport->port.lock, flags);
 
-       lpuart_setup_watermark(sport);
-
-       temp = readb(sport->port.membase + UARTCR2);
-       temp |= UARTCR2_RIE | UARTCR2_TIE | UARTCR2_RE | UARTCR2_TE;
-       writeb(temp, sport->port.membase + UARTCR2);
+       lpuart_setup_watermark_enable(sport);
 
        lpuart_rx_dma_startup(sport);
        lpuart_tx_dma_startup(sport);
@@ -1538,11 +1556,7 @@ static int lpuart32_startup(struct uart_port *port)
 
        spin_lock_irqsave(&sport->port.lock, flags);
 
-       lpuart32_setup_watermark(sport);
-
-       temp = lpuart32_read(&sport->port, UARTCTRL);
-       temp |= UARTCTRL_RE | UARTCTRL_TE | UARTCTRL_ILIE;
-       lpuart32_write(&sport->port, temp, UARTCTRL);
+       lpuart32_setup_watermark_enable(sport);
 
 
        lpuart_rx_dma_startup(sport);
@@ -2558,22 +2572,14 @@ static int lpuart_resume(struct device *dev)
 {
        struct lpuart_port *sport = dev_get_drvdata(dev);
        bool irq_wake = irqd_is_wakeup_set(irq_get_irq_data(sport->port.irq));
-       unsigned long temp;
 
        if (sport->port.suspended && !irq_wake)
                lpuart_enable_clks(sport);
 
-       if (lpuart_is_32(sport)) {
-               lpuart32_setup_watermark(sport);
-               temp = lpuart32_read(&sport->port, UARTCTRL);
-               temp |= UARTCTRL_RE | UARTCTRL_TE | UARTCTRL_ILIE;
-               lpuart32_write(&sport->port, temp, UARTCTRL);
-       } else {
-               lpuart_setup_watermark(sport);
-               temp = readb(sport->port.membase + UARTCR2);
-               temp |= UARTCR2_RIE | UARTCR2_TIE | UARTCR2_RE | UARTCR2_TE;
-               writeb(temp, sport->port.membase + UARTCR2);
-       }
+       if (lpuart_is_32(sport))
+               lpuart32_setup_watermark_enable(sport);
+       else
+               lpuart_setup_watermark_enable(sport);
 
        if (sport->lpuart_dma_rx_use) {
                if (irq_wake) {