tty: n_tty: rename and retype 'retval' in n_tty_ioctl()
authorJiri Slaby (SUSE) <jirislaby@kernel.org>
Tue, 19 Sep 2023 08:51:43 +0000 (10:51 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 3 Oct 2023 12:31:15 +0000 (14:31 +0200)
The value stored to the current 'retval' is number of characters. It is
both obtained and put to user as unsigned. So make its type unsigned.
And provided it's not a "return value" per se, rename it to 'num'.

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

index 71aa898..e917faa 100644 (file)
@@ -2498,7 +2498,7 @@ static int n_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
                       unsigned long arg)
 {
        struct n_tty_data *ldata = tty->disc_data;
-       int retval;
+       unsigned int num;
 
        switch (cmd) {
        case TIOCOUTQ:
@@ -2506,11 +2506,11 @@ static int n_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
        case TIOCINQ:
                down_write(&tty->termios_rwsem);
                if (L_ICANON(tty) && !L_EXTPROC(tty))
-                       retval = inq_canon(ldata);
+                       num = inq_canon(ldata);
                else
-                       retval = read_cnt(ldata);
+                       num = read_cnt(ldata);
                up_write(&tty->termios_rwsem);
-               return put_user(retval, (unsigned int __user *) arg);
+               return put_user(num, (unsigned int __user *) arg);
        default:
                return n_tty_ioctl_helper(tty, cmd, arg);
        }