aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2018-09-12 07:49:44 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2018-10-13 00:50:43 -0400
commitf82fc0fedf28ba09b0abd0533202447846d48fb9 (patch)
treedaed890d0869e1d5d8052ad442031f9cc29b4d74
parent930236a30897532653a61ed22ae7eca13154accd (diff)
synclink: reduce pointless checks in ->ioctl()
it's never getting called with TIOC[SG]SERIAL anymore (nor has it ever supported those, while we are at it) Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--drivers/char/pcmcia/synclink_cs.c3
-rw-r--r--drivers/tty/synclink.c3
-rw-r--r--drivers/tty/synclink_gt.c3
-rw-r--r--drivers/tty/synclinkmp.c3
4 files changed, 4 insertions, 8 deletions
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index 66b04194aa9f..82f9a6a814ae 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -2237,8 +2237,7 @@ static int mgslpc_ioctl(struct tty_struct *tty,
2237 if (mgslpc_paranoia_check(info, tty->name, "mgslpc_ioctl")) 2237 if (mgslpc_paranoia_check(info, tty->name, "mgslpc_ioctl"))
2238 return -ENODEV; 2238 return -ENODEV;
2239 2239
2240 if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) && 2240 if (cmd != TIOCMIWAIT) {
2241 (cmd != TIOCMIWAIT)) {
2242 if (tty_io_error(tty)) 2241 if (tty_io_error(tty))
2243 return -EIO; 2242 return -EIO;
2244 } 2243 }
diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
index fbdf4d01c6a9..d55c858d6058 100644
--- a/drivers/tty/synclink.c
+++ b/drivers/tty/synclink.c
@@ -2959,8 +2959,7 @@ static int mgsl_ioctl(struct tty_struct *tty,
2959 if (mgsl_paranoia_check(info, tty->name, "mgsl_ioctl")) 2959 if (mgsl_paranoia_check(info, tty->name, "mgsl_ioctl"))
2960 return -ENODEV; 2960 return -ENODEV;
2961 2961
2962 if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) && 2962 if (cmd != TIOCMIWAIT) {
2963 (cmd != TIOCMIWAIT)) {
2964 if (tty_io_error(tty)) 2963 if (tty_io_error(tty))
2965 return -EIO; 2964 return -EIO;
2966 } 2965 }
diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
index a94086597ebd..b8287a010336 100644
--- a/drivers/tty/synclink_gt.c
+++ b/drivers/tty/synclink_gt.c
@@ -1029,8 +1029,7 @@ static int ioctl(struct tty_struct *tty,
1029 return -ENODEV; 1029 return -ENODEV;
1030 DBGINFO(("%s ioctl() cmd=%08X\n", info->device_name, cmd)); 1030 DBGINFO(("%s ioctl() cmd=%08X\n", info->device_name, cmd));
1031 1031
1032 if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) && 1032 if (cmd != TIOCMIWAIT) {
1033 (cmd != TIOCMIWAIT)) {
1034 if (tty_io_error(tty)) 1033 if (tty_io_error(tty))
1035 return -EIO; 1034 return -EIO;
1036 } 1035 }
diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
index 1e4d5b9c981a..fcb91bf7a15b 100644
--- a/drivers/tty/synclinkmp.c
+++ b/drivers/tty/synclinkmp.c
@@ -1259,8 +1259,7 @@ static int ioctl(struct tty_struct *tty,
1259 if (sanity_check(info, tty->name, "ioctl")) 1259 if (sanity_check(info, tty->name, "ioctl"))
1260 return -ENODEV; 1260 return -ENODEV;
1261 1261
1262 if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) && 1262 if (cmd != TIOCMIWAIT) {
1263 (cmd != TIOCMIWAIT)) {
1264 if (tty_io_error(tty)) 1263 if (tty_io_error(tty))
1265 return -EIO; 1264 return -EIO;
1266 } 1265 }