Commit 602c8021 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

serial: move WARN_ON() in uart_write() to the condition 



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: default avatarJiri Slaby (SUSE) <jirislaby@kernel.org>
Link: https://lore.kernel.org/r/20230731080244.2698-2-jirislaby@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fe301574

drivers/tty/serial/serial_core.c

+2 −6
Original line number Diff line number Diff line
@@ -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);