tty: use 'if' in send_break() instead of 'goto'
authorJiri Slaby (SUSE) <jirislaby@kernel.org>
Tue, 19 Sep 2023 08:51:56 +0000 (10:51 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 3 Oct 2023 12:31:16 +0000 (14:31 +0200)
Now, the "jumped-over" code is simple enough to be put inside an 'if'.
Do so to make it 'goto'-less.

Signed-off-by: "Jiri Slaby (SUSE)" <jirislaby@kernel.org>
Link: https://lore.kernel.org/r/20230919085156.1578-16-jirislaby@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/tty_io.c

index 24833b31b81c09742454f003229b60aafa01de6f..378257c4c41a93899cbf3405871e831d4cb5e085 100644 (file)
@@ -2482,11 +2482,10 @@ static int send_break(struct tty_struct *tty, unsigned int duration)
                return -EINTR;
 
        retval = tty->ops->break_ctl(tty, -1);
-       if (retval)
-               goto out;
-       msleep_interruptible(duration);
-       retval = tty->ops->break_ctl(tty, 0);
-out:
+       if (!retval) {
+               msleep_interruptible(duration);
+               retval = tty->ops->break_ctl(tty, 0);
+       }
        tty_write_unlock(tty);
 
        if (signal_pending(current))