Skip to content

Commit

Permalink
serial: 8250: rename unlock labels
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Johan Hovold authored and Greg Kroah-Hartman committed Oct 21, 2021
1 parent 211cde4 commit d2248ca
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/tty/serial/8250/8250_port.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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);

/*
Expand Down Expand Up @@ -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;

Expand All @@ -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);
Expand Down

0 comments on commit d2248ca

Please sign in to comment.