]> git.baikalelectronics.ru Git - kernel.git/commitdiff
serial: 8250: rename unlock labels
authorJohan Hovold <johan@kernel.org>
Fri, 15 Oct 2021 11:14:21 +0000 (13:14 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 21 Oct 2021 08:37:10 +0000 (10:37 +0200)
Rename a couple of oddly named labels that are used to unlock before
returning after what they do (rather than after the context they are
used in) to improve readability.

Tested-by: Serge Semin <fancer.lancer@gmail.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Serge Semin <fancer.lancer@gmail.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
Link: https://lore.kernel.org/r/20211015111422.1027-3-johan@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/8250/8250_port.c

index e4dd82fd7c2a57e6475668b6879465b038834dc5..5775cbff8f6ebf5916b61087384901b0ed684b4e 100644 (file)
@@ -1338,7 +1338,7 @@ static void autoconfig(struct uart_8250_port *up)
        up->tx_loadsz = uart_config[port->type].tx_loadsz;
 
        if (port->type == PORT_UNKNOWN)
-               goto out_lock;
+               goto out_unlock;
 
        /*
         * Reset the UART.
@@ -1355,7 +1355,7 @@ static void autoconfig(struct uart_8250_port *up)
        else
                serial_out(up, UART_IER, 0);
 
-out_lock:
+out_unlock:
        spin_unlock_irqrestore(&port->lock, flags);
 
        /*
@@ -2714,12 +2714,12 @@ void serial8250_update_uartclk(struct uart_port *port, unsigned int uartclk)
        mutex_lock(&tport->mutex);
 
        if (port->uartclk == uartclk)
-               goto out_lock;
+               goto out_unlock;
 
        port->uartclk = uartclk;
 
        if (!tty_port_initialized(tport))
-               goto out_lock;
+               goto out_unlock;
 
        termios = &tty->termios;
 
@@ -2737,7 +2737,7 @@ void serial8250_update_uartclk(struct uart_port *port, unsigned int uartclk)
        spin_unlock_irqrestore(&port->lock, flags);
        serial8250_rpm_put(up);
 
-out_lock:
+out_unlock:
        mutex_unlock(&tport->mutex);
        up_write(&tty->termios_rwsem);
        tty_kref_put(tty);