From a3096199226c2e4dc019f21c1bed6e96092d4a71 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Wed, 12 Sep 2018 18:37:18 -0400 Subject: [PATCH] remove fallback to drivers for TIOCGICOUNT none of them handles it anyway. Reviewed-by: Johan Hovold Signed-off-by: Al Viro --- drivers/tty/tty_io.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c index ccc0055b2dfc..1a55c3e20299 100644 --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c @@ -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: -- 2.11.0