public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: "Théo Lebrun" <theo.lebrun@bootlin.com>
To: Russell King <linux@armlinux.org.uk>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Jiri Slaby <jirislaby@kernel.org>
Cc: linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org,
	"Linus Walleij" <linus.walleij@linaro.org>,
	"Gregory CLEMENT" <gregory.clement@bootlin.com>,
	"Alexandre Belloni" <alexandre.belloni@bootlin.com>,
	"Thomas Petazzoni" <thomas.petazzoni@bootlin.com>,
	"Vladimir Kondratiev" <vladimir.kondratiev@mobileye.com>,
	"Tawfik Bayouk" <tawfik.bayouk@mobileye.com>,
	"Théo Lebrun" <theo.lebrun@bootlin.com>
Subject: [PATCH 5/6] tty: serial: amba-pl011: unindent pl011_console_get_options function body
Date: Thu, 26 Oct 2023 12:41:22 +0200	[thread overview]
Message-ID: <20231026-mbly-uart-v1-5-9258eea297d3@bootlin.com> (raw)
In-Reply-To: <20231026-mbly-uart-v1-0-9258eea297d3@bootlin.com>

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.

Signed-off-by: Théo Lebrun <theo.lebrun@bootlin.com>
---
 drivers/tty/serial/amba-pl011.c | 42 ++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index bb3082c4d35c..5774d48c7f16 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -2369,34 +2369,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';
+	}
+
+	if ((lcr_h & 0x60) == UART01x_LCRH_WLEN_7)
+		*bits = 7;
+	else
+		*bits = 8;
 
-		ibrd = pl011_read(uap, REG_IBRD);
-		fbrd = pl011_read(uap, REG_FBRD);
+	ibrd = pl011_read(uap, REG_IBRD);
+	fbrd = pl011_read(uap, REG_FBRD);
 
-		*baud = uap->port.uartclk * 4 / (64 * ibrd + fbrd);
+	*baud = uap->port.uartclk * 4 / (64 * ibrd + fbrd);
 
-		if (uap->vendor->oversampling) {
-			if (pl011_read(uap, REG_CR)
-				  & ST_UART011_CR_OVSFACT)
-				*baud *= 2;
-		}
+	if (uap->vendor->oversampling &&
+	    (pl011_read(uap, REG_CR) & ST_UART011_CR_OVSFACT)) {
+		*baud *= 2;
 	}
 }
 

-- 
2.41.0


  parent reply	other threads:[~2023-10-26 10:42 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-26 10:41 [PATCH 0/6] Cleanup AMBA PL011 driver Théo Lebrun
2023-10-26 10:41 ` [PATCH 1/6] tty: serial: amba: cleanup whitespace Théo Lebrun
2023-10-26 12:05   ` Linus Walleij
2023-10-26 10:41 ` [PATCH 2/6] tty: serial: amba: Use BIT() macro for constant declarations Théo Lebrun
2023-10-26 13:37   ` Linus Walleij
2023-10-26 14:14     ` Théo Lebrun
2023-10-26 10:41 ` [PATCH 3/6] tty: serial: amba-pl011: cleanup driver Théo Lebrun
2023-10-26 13:38   ` Linus Walleij
2023-10-26 10:41 ` [PATCH 4/6] tty: serial: amba-pl011: replace TIOCMBIT macros by static functions Théo Lebrun
2023-10-26 13:46   ` Linus Walleij
2023-10-26 14:24   ` Hugo Villeneuve
2023-10-26 14:37     ` Théo Lebrun
2023-10-26 10:41 ` Théo Lebrun [this message]
2023-10-26 13:46   ` [PATCH 5/6] tty: serial: amba-pl011: unindent pl011_console_get_options function body Linus Walleij
2023-10-26 10:41 ` [PATCH 6/6] tty: serial: amba-pl011: Parse bits option as 5, 6, 7 or 8 in _get_options Théo Lebrun
2023-10-26 11:13   ` Ilpo Järvinen
2023-10-26 12:54     ` Théo Lebrun
2023-10-26 13:48   ` Linus Walleij
2023-10-26 14:18     ` Théo Lebrun
2023-10-26 14:53   ` Hugo Villeneuve
2023-10-31  9:35     ` Théo Lebrun
2023-10-31 10:11       ` Russell King (Oracle)
2023-10-31 11:04         ` Théo Lebrun
2023-10-31 11:22           ` Russell King (Oracle)
2023-10-31 13:51             ` Théo Lebrun
2023-10-31 14:05               ` Russell King (Oracle)
2023-10-31 14:30                 ` Théo Lebrun
2023-10-31 13:39       ` Hugo Villeneuve

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231026-mbly-uart-v1-5-9258eea297d3@bootlin.com \
    --to=theo.lebrun@bootlin.com \
    --cc=alexandre.belloni@bootlin.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=gregory.clement@bootlin.com \
    --cc=jirislaby@kernel.org \
    --cc=linus.walleij@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-serial@vger.kernel.org \
    --cc=linux@armlinux.org.uk \
    --cc=tawfik.bayouk@mobileye.com \
    --cc=thomas.petazzoni@bootlin.com \
    --cc=vladimir.kondratiev@mobileye.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox