serial: 8250_rsa: use guard()s

Having all the new guards, use them in the 8250_rsa code. This improves
readability, makes error handling easier, and marks locked portions of
code explicit.

Signed-off-by: "Jiri Slaby (SUSE)" <jirislaby@kernel.org>
Link: https://lore.kernel.org/r/20250814072456.182853-14-jirislaby@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/8250/8250_rsa.c b/drivers/tty/serial/8250/8250_rsa.c
index d34093cc03ad9407f7117dda49554625c14e019a..ff52ad02f6be6f305a105079fd432b98553a3317 100644 (file)
--- a/drivers/tty/serial/8250/8250_rsa.c
+++ b/drivers/tty/serial/8250/8250_rsa.c
@@ -140,9 +140,8 @@ void rsa_enable(struct uart_8250_port *up)
                return;
 
        if (up->port.uartclk != SERIAL_RSA_BAUD_BASE * 16) {
-               uart_port_lock_irq(&up->port);
+               guard(uart_port_lock_irq)(&up->port);
                __rsa_enable(up);
-               uart_port_unlock_irq(&up->port);
        }
        if (up->port.uartclk == SERIAL_RSA_BAUD_BASE * 16)
                serial_out(up, UART_RSA_FRR, 0);
@@ -165,7 +164,8 @@ void rsa_disable(struct uart_8250_port *up)
        if (up->port.uartclk != SERIAL_RSA_BAUD_BASE * 16)
                return;
 
-       uart_port_lock_irq(&up->port);
+       guard(uart_port_lock_irq)(&up->port);
+
        mode = serial_in(up, UART_RSA_MSR);
        result = !(mode & UART_RSA_MSR_FIFO);
 
@@ -177,7 +177,6 @@ void rsa_disable(struct uart_8250_port *up)
 
        if (result)
                up->port.uartclk = SERIAL_RSA_BAUD_BASE_LO * 16;
-       uart_port_unlock_irq(&up->port);
 }
 EXPORT_SYMBOL_GPL_FOR_MODULES(rsa_disable, "8250_base");