]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
tty: n_hdlc: simplify return from n_hdlc_tty_ioctl()
authorJiri Slaby (SUSE) <jirislaby@kernel.org>
Wed, 19 Nov 2025 10:01:33 +0000 (11:01 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 21 Nov 2025 17:30:40 +0000 (18:30 +0100)
The cases in the switch() of n_hdlc_tty_ioctl() can return immediately
-- no need to store into error and return later.

Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org>
Link: https://patch.msgid.link/20251119100140.830761-4-jirislaby@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/n_hdlc.c

index 4a4dc58b866a65c25da246bf69b65840119cccf6..66bb8ce6ec40c258964723a41eb7228b66acd72b 100644 (file)
@@ -584,7 +584,6 @@ static int n_hdlc_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
                            unsigned long arg)
 {
        struct n_hdlc *n_hdlc = tty->disc_data;
-       int error = 0;
        int count;
        unsigned long flags;
        struct n_hdlc_buf *buf = NULL;
@@ -603,8 +602,7 @@ static int n_hdlc_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
                else
                        count = 0;
                spin_unlock_irqrestore(&n_hdlc->rx_buf_list.spinlock, flags);
-               error = put_user(count, (int __user *)arg);
-               break;
+               return put_user(count, (int __user *)arg);
 
        case TIOCOUTQ:
                /* get the pending tx byte count in the driver */
@@ -616,8 +614,7 @@ static int n_hdlc_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
                if (buf)
                        count += buf->count;
                spin_unlock_irqrestore(&n_hdlc->tx_buf_list.spinlock, flags);
-               error = put_user(count, (int __user *)arg);
-               break;
+               return put_user(count, (int __user *)arg);
 
        case TCFLSH:
                switch (arg) {
@@ -628,11 +625,8 @@ static int n_hdlc_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
                fallthrough;    /* to default */
 
        default:
-               error = n_tty_ioctl_helper(tty, cmd, arg);
-               break;
+               return n_tty_ioctl_helper(tty, cmd, arg);
        }
-       return error;
-
 }      /* end of n_hdlc_tty_ioctl() */
 
 /**