linux-serial.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Jiri Slaby (SUSE)" <jirislaby@kernel.org>
To: gregkh@linuxfoundation.org
Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org,
	"Jiri Slaby (SUSE)" <jirislaby@kernel.org>
Subject: [PATCH 01/10] serial: move WARN_ON() in uart_write() to the condition
Date: Mon, 31 Jul 2023 10:02:35 +0200	[thread overview]
Message-ID: <20230731080244.2698-2-jirislaby@kernel.org> (raw)
In-Reply-To: <20230731080244.2698-1-jirislaby@kernel.org>

uart code currently does the following in uart_write() and
uart_flush_buffer():
  if (cond) {
    WARN_ON(1);
    return;
  }

It can be rewritten to more obvious and more readable:
  if (WARN_ON(cond))
    return;

Do so.

Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org>
---
 drivers/tty/serial/serial_core.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index 306ea1a560e6..e31c9b6bd8ab 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -593,10 +593,8 @@ static int uart_write(struct tty_struct *tty,
 	 * This means you called this function _after_ the port was
 	 * closed.  No cookie for you.
 	 */
-	if (!state) {
-		WARN_ON(1);
+	if (WARN_ON(!state))
 		return -EL3HLT;
-	}
 
 	port = uart_port_lock(state, flags);
 	circ = &state->xmit;
@@ -659,10 +657,8 @@ static void uart_flush_buffer(struct tty_struct *tty)
 	 * This means you called this function _after_ the port was
 	 * closed.  No cookie for you.
 	 */
-	if (!state) {
-		WARN_ON(1);
+	if (WARN_ON(!state))
 		return;
-	}
 
 	pr_debug("uart_flush_buffer(%d) called\n", tty->index);
 
-- 
2.41.0


  reply	other threads:[~2023-07-31  8:04 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-31  8:02 [PATCH 00/10] tty: minor cleanups Jiri Slaby (SUSE)
2023-07-31  8:02 ` Jiri Slaby (SUSE) [this message]
2023-07-31  8:02 ` [PATCH 02/10] Bluetooth: rfcomm: remove casts from tty->driver_data Jiri Slaby (SUSE)
2023-07-31  8:02 ` [PATCH 03/10] tty: hvsi: remove an extra variable from hvsi_write() Jiri Slaby (SUSE)
2023-07-31  8:02 ` [PATCH 04/10] input: serport: remove casts from tty->disc_data Jiri Slaby (SUSE)
2023-07-31 16:18   ` Dmitry Torokhov
2023-07-31  8:02 ` [PATCH 05/10] can: slcan: " Jiri Slaby (SUSE)
2023-07-31  8:16   ` Marc Kleine-Budde
2023-07-31  8:02 ` [PATCH 06/10] serial: altera_jtaguart: switch status to u32 Jiri Slaby (SUSE)
2023-08-08 14:34   ` Tobias Klauser
2023-07-31  8:02 ` [PATCH 07/10] speakup: switch to unsigned iterator in spk_ttyio_receive_buf2() Jiri Slaby (SUSE)
2023-07-31  8:02 ` [PATCH 08/10] misc: ti-st: remove forward declarations and make st_int_recv() static Jiri Slaby (SUSE)
2023-07-31  8:02 ` [PATCH 09/10] misc: ti-st: remove ptr from recv functions Jiri Slaby (SUSE)
2023-07-31  8:02 ` [PATCH 10/10] misc: ti-st: don't check for tty data == NULL Jiri Slaby (SUSE)
2023-07-31  8:15 ` [PATCH 00/10] tty: minor cleanups Marc Kleine-Budde
2023-07-31  8:21   ` Jiri Slaby

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=20230731080244.2698-2-jirislaby@kernel.org \
    --to=jirislaby@kernel.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-serial@vger.kernel.org \
    /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;
as well as URLs for NNTP newsgroup(s).