OSDN Git Service

remove fallback to drivers for TIOCGICOUNT
authorAl Viro <viro@zeniv.linux.org.uk>
Wed, 12 Sep 2018 22:37:18 +0000 (18:37 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Sat, 13 Oct 2018 04:50:47 +0000 (00:50 -0400)
none of them handles it anyway.

Reviewed-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
drivers/tty/tty_io.c

index ccc0055..1a55c3e 100644 (file)
@@ -2606,11 +2606,7 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
        case TIOCMBIS:
                return tty_tiocmset(tty, cmd, p);
        case TIOCGICOUNT:
-               retval = tty_tiocgicount(tty, p);
-               /* For the moment allow fall through to the old method */
-               if (retval != -EINVAL)
-                       return retval;
-               break;
+               return tty_tiocgicount(tty, p);
        case TCFLSH:
                switch (arg) {
                case TCIFLUSH: