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: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Théo Lebrun <theo.lebrun@bootlin.com>
Link: https://lore.kernel.org/r/20231207-mbly-uart-v6-7-e384afa5e78c@bootlin.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index e15bfac5352d705c81a43fdf47f905386bd6cda0..8e129c58c44b556af3cee54c0fc91dc84a4081b2 100644 (file)
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -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,
                                      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';
-               if (lcr_h & UART01x_LCRH_PEN) {
-                       if (lcr_h & UART01x_LCRH_EPS)
-                               *parity = 'e';
-                       else
-                               *parity = 'o';
-               }
+       lcr_h = pl011_read(uap, REG_LCRH_TX);
 
-               if ((lcr_h & 0x60) == UART01x_LCRH_WLEN_7)
-                       *bits = 7;
+       *parity = 'n';
+       if (lcr_h & UART01x_LCRH_PEN) {
+               if (lcr_h & UART01x_LCRH_EPS)
+                       *parity = 'e';
                else
-                       *bits = 8;
+                       *parity = 'o';
+       }
 
-               ibrd = pl011_read(uap, REG_IBRD);
-               fbrd = pl011_read(uap, REG_FBRD);
+       if ((lcr_h & 0x60) == UART01x_LCRH_WLEN_7)
+               *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) {
-                       if (pl011_read(uap, REG_CR)
-                                 & ST_UART011_CR_OVSFACT)
-                               *baud *= 2;
-               }
-       }
+       *baud = uap->port.uartclk * 4 / (64 * ibrd + fbrd);
+
+       if (uap->vendor->oversampling &&
+           (pl011_read(uap, REG_CR) & ST_UART011_CR_OVSFACT))
+               *baud *= 2;
 }
 
 static int pl011_console_setup(struct console *co, char *options)