Commit 8ff87406 authored by Théo Lebrun's avatar Théo Lebrun Committed by Greg Kroah-Hartman

tty: serial: amba-pl011: unindent pl011_console_get_options function body

The whole function body is encapsulated inside an if-condition. Reverse
the if logic and early return to remove one indentation level.

Also turn two nested ifs into a single one at the end of the function.
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarThéo Lebrun <theo.lebrun@bootlin.com>
Link: https://lore.kernel.org/r/20231207-mbly-uart-v6-7-e384afa5e78c@bootlin.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 826bd77a
...@@ -2363,35 +2363,34 @@ pl011_console_write(struct console *co, const char *s, unsigned int count) ...@@ -2363,35 +2363,34 @@ pl011_console_write(struct console *co, const char *s, unsigned int count)
static void pl011_console_get_options(struct uart_amba_port *uap, int *baud, static void pl011_console_get_options(struct uart_amba_port *uap, int *baud,
int *parity, int *bits) int *parity, int *bits)
{ {
if (pl011_read(uap, REG_CR) & UART01x_CR_UARTEN) { unsigned int lcr_h, ibrd, fbrd;
unsigned int lcr_h, ibrd, fbrd;
lcr_h = pl011_read(uap, REG_LCRH_TX); if (!(pl011_read(uap, REG_CR) & UART01x_CR_UARTEN))
return;
*parity = 'n'; lcr_h = pl011_read(uap, REG_LCRH_TX);
if (lcr_h & UART01x_LCRH_PEN) {
if (lcr_h & UART01x_LCRH_EPS)
*parity = 'e';
else
*parity = 'o';
}
if ((lcr_h & 0x60) == UART01x_LCRH_WLEN_7) *parity = 'n';
*bits = 7; if (lcr_h & UART01x_LCRH_PEN) {
if (lcr_h & UART01x_LCRH_EPS)
*parity = 'e';
else else
*bits = 8; *parity = 'o';
}
ibrd = pl011_read(uap, REG_IBRD); if ((lcr_h & 0x60) == UART01x_LCRH_WLEN_7)
fbrd = pl011_read(uap, REG_FBRD); *bits = 7;
else
*bits = 8;
*baud = uap->port.uartclk * 4 / (64 * ibrd + fbrd); ibrd = pl011_read(uap, REG_IBRD);
fbrd = pl011_read(uap, REG_FBRD);
if (uap->vendor->oversampling) { *baud = uap->port.uartclk * 4 / (64 * ibrd + fbrd);
if (pl011_read(uap, REG_CR)
& ST_UART011_CR_OVSFACT) if (uap->vendor->oversampling &&
*baud *= 2; (pl011_read(uap, REG_CR) & ST_UART011_CR_OVSFACT))
} *baud *= 2;
}
} }
static int pl011_console_setup(struct console *co, char *options) static int pl011_console_setup(struct console *co, char *options)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment