diff options
| author | Jiri Slaby (SUSE) <jirislaby@kernel.org> | 2025-06-11 12:03:17 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-06-17 13:42:36 +0200 |
| commit | 6529c88f6bfedaa5bc2354eb448771d884798877 (patch) | |
| tree | b4de7fde9e909a1d7ad5a675c64f52a60b0c56c4 | |
| parent | 05b537a175442c530593013ea31b3f48d5624916 (diff) | |
serial: 8250: invert condition to avoid a goto label
Use of "goto" in this code is frowned upon:
+-------
|if (port->type == PORT_UNKNOWN)
| goto out_unlock;
|CODE;
|out_unlock:
+-------
Instead, simply do:
+-------
|if (port->type != PORT_UNKNOWN)
| CODE;
+-------
Signed-off-by: "Jiri Slaby (SUSE)" <jirislaby@kernel.org>
Link: https://lore.kernel.org/r/20250611100319.186924-32-jirislaby@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/tty/serial/8250/8250_port.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c index e93bfdac3d0e..48c30e158cb8 100644 --- a/drivers/tty/serial/8250/8250_port.c +++ b/drivers/tty/serial/8250/8250_port.c @@ -1184,19 +1184,17 @@ static void autoconfig(struct uart_8250_port *up) up->capabilities = uart_config[port->type].flags; up->tx_loadsz = uart_config[port->type].tx_loadsz; - if (port->type == PORT_UNKNOWN) - goto out_unlock; - - /* - * Reset the UART. - */ - rsa_reset(up); - serial8250_out_MCR(up, save_mcr); - serial8250_clear_fifos(up); - serial_in(up, UART_RX); - serial8250_clear_IER(up); + if (port->type != PORT_UNKNOWN) { + /* + * Reset the UART. + */ + rsa_reset(up); + serial8250_out_MCR(up, save_mcr); + serial8250_clear_fifos(up); + serial_in(up, UART_RX); + serial8250_clear_IER(up); + } -out_unlock: uart_port_unlock_irqrestore(port, flags); /* |