From: Al Viro <viro@zeniv.linux.org.uk>
Date: Wed, 12 Sep 2018 22:37:18 +0000 (-0400)
Subject: remove fallback to drivers for TIOCGICOUNT
X-Git-Tag: v4.20-rc1~145^2~11
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a3096199226c2e4dc019f21c1bed6e96092d4a71;p=users%2Fjedix%2Flinux-maple.git

remove fallback to drivers for TIOCGICOUNT

none of them handles it anyway.

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

diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index ccc0055b2dfcb..1a55c3e202992 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: