serial: 8250: use serial_port_in/out() helpers

There are serial_port_in/out() helpers to be used instead of direct
p->serial_in/out(). Use them in various 8250 drivers.

Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org>
Cc: "Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
--
[v2]
* Use serial_port_in/out() and not serial_in/out() [Andy]

Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> # 8250_dw
Link: https://lore.kernel.org/r/20250317070046.24386-28-jirislaby@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c
index af24ec25d976be5932f71ce8a23a30ee05b5eeff..f068b8d7840a9239f4e194c1a9ccf80dac2dfd0f 100644 (file)
--- a/drivers/tty/serial/8250/8250_dw.c
+++ b/drivers/tty/serial/8250/8250_dw.c
@@ -120,12 +120,12 @@ static void dw8250_force_idle(struct uart_port *p)
         * enabled.
         */
        if (up->fcr & UART_FCR_ENABLE_FIFO) {
-               lsr = p->serial_in(p, UART_LSR);
+               lsr = serial_port_in(p, UART_LSR);
                if (!(lsr & UART_LSR_DR))
                        return;
        }
 
-       (void)p->serial_in(p, UART_RX);
+       serial_port_in(p, UART_RX);
 }
 
 static void dw8250_check_lcr(struct uart_port *p, int offset, int value)
@@ -139,7 +139,7 @@ static void dw8250_check_lcr(struct uart_port *p, int offset, int value)
 
        /* Make sure LCR write wasn't ignored */
        while (tries--) {
-               unsigned int lcr = p->serial_in(p, offset);
+               unsigned int lcr = serial_port_in(p, offset);
 
                if ((value & ~UART_LCR_SPAR) == (lcr & ~UART_LCR_SPAR))
                        return;
@@ -260,7 +260,7 @@ static int dw8250_handle_irq(struct uart_port *p)
 {
        struct uart_8250_port *up = up_to_u8250p(p);
        struct dw8250_data *d = to_dw8250_data(p->private_data);
-       unsigned int iir = p->serial_in(p, UART_IIR);
+       unsigned int iir = serial_port_in(p, UART_IIR);
        bool rx_timeout = (iir & 0x3f) == UART_IIR_RX_TIMEOUT;
        unsigned int quirks = d->pdata->quirks;
        unsigned int status;
@@ -281,7 +281,7 @@ static int dw8250_handle_irq(struct uart_port *p)
                status = serial_lsr_in(up);
 
                if (!(status & (UART_LSR_DR | UART_LSR_BI)))
-                       (void) p->serial_in(p, UART_RX);
+                       serial_port_in(p, UART_RX);
 
                uart_port_unlock_irqrestore(p, flags);
        }
@@ -303,7 +303,7 @@ static int dw8250_handle_irq(struct uart_port *p)
 
        if ((iir & UART_IIR_BUSY) == UART_IIR_BUSY) {
                /* Clear the USR */
-               (void)p->serial_in(p, d->pdata->usr_reg);
+               serial_port_in(p, d->pdata->usr_reg);
 
                return 1;
        }
@@ -390,7 +390,7 @@ static void dw8250_set_termios(struct uart_port *p, struct ktermios *termios,
 static void dw8250_set_ldisc(struct uart_port *p, struct ktermios *termios)
 {
        struct uart_8250_port *up = up_to_u8250p(p);
-       unsigned int mcr = p->serial_in(p, UART_MCR);
+       unsigned int mcr = serial_port_in(p, UART_MCR);
 
        if (up->capabilities & UART_CAP_IRDA) {
                if (termios->c_line == N_IRDA)
@@ -398,7 +398,7 @@ static void dw8250_set_ldisc(struct uart_port *p, struct ktermios *termios)
                else
                        mcr &= ~DW_UART_MCR_SIRE;
 
-               p->serial_out(p, UART_MCR, mcr);
+               serial_port_out(p, UART_MCR, mcr);
        }
        serial8250_do_set_ldisc(p, termios);
 }

diff --git a/drivers/tty/serial/8250/8250_fsl.c b/drivers/tty/serial/8250/8250_fsl.c
index 1b7bd55619c660a1e8137b267267435b8e7a69a9..649ae5c8304d54a22b2f964e3267e1cb94334f21 100644 (file)
--- a/drivers/tty/serial/8250/8250_fsl.c
+++ b/drivers/tty/serial/8250/8250_fsl.c
@@ -32,7 +32,7 @@ int fsl8250_handle_irq(struct uart_port *port)
 
        uart_port_lock_irqsave(&up->port, &flags);
 
-       iir = port->serial_in(port, UART_IIR);
+       iir = serial_port_in(port, UART_IIR);
        if (iir & UART_IIR_NO_INT) {
                uart_port_unlock_irqrestore(&up->port, flags);
                return 0;
@@ -54,12 +54,12 @@ int fsl8250_handle_irq(struct uart_port *port)
        if (unlikely((iir & UART_IIR_ID) == UART_IIR_RLSI &&
                     (up->lsr_saved_flags & UART_LSR_BI))) {
                up->lsr_saved_flags &= ~UART_LSR_BI;
-               port->serial_in(port, UART_RX);
+               serial_port_in(port, UART_RX);
                uart_port_unlock_irqrestore(&up->port, flags);
                return 1;
        }
 
-       lsr = orig_lsr = up->port.serial_in(&up->port, UART_LSR);
+       lsr = orig_lsr = serial_port_in(port, UART_LSR);
 
        /* Process incoming characters first */
        if ((lsr & (UART_LSR_DR | UART_LSR_BI)) &&
@@ -71,7 +71,7 @@ int fsl8250_handle_irq(struct uart_port *port)
        if ((orig_lsr & UART_LSR_OE) && (up->overrun_backoff_time_ms > 0)) {
                unsigned long delay;
 
-               up->ier = port->serial_in(port, UART_IER);
+               up->ier = serial_port_in(port, UART_IER);
                if (up->ier & (UART_IER_RLSI | UART_IER_RDI)) {
                        port->ops->stop_rx(port);
                } else {

diff --git a/drivers/tty/serial/8250/8250_omap.c b/drivers/tty/serial/8250/8250_omap.c
index c2b75e3f106d0cbdd2fd99eb5f1a534b6863cc7f..2a0ce11f405d2d23950c7e75132c609bdcc61859 100644 (file)
--- a/drivers/tty/serial/8250/8250_omap.c
+++ b/drivers/tty/serial/8250/8250_omap.c
@@ -692,7 +692,7 @@ static irqreturn_t omap8250_irq(int irq, void *dev_id)
 
                /* Synchronize UART_IER access against the console. */
                uart_port_lock(port);
-               up->ier = port->serial_in(port, UART_IER);
+               up->ier = serial_port_in(port, UART_IER);
                if (up->ier & (UART_IER_RLSI | UART_IER_RDI)) {
                        port->ops->stop_rx(port);
                } else {