synclink: reduce pointless checks in ->ioctl()

Al Viro · Al Viro · commit f82fc0fedf28 · 2018-10-13T00:50:43.000-04:00
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 &lt;viro@zeniv.linux.org.uk&gt;
diff --git 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,
 	if (mgslpc_paranoia_check(info, tty->name, "mgslpc_ioctl"))
 		return -ENODEV;
 
-	if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) &&
-	    (cmd != TIOCMIWAIT)) {
+	if (cmd != TIOCMIWAIT) {
 		if (tty_io_error(tty))
 		    return -EIO;
 	}
diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
@@ -2959,8 +2959,7 @@ static int mgsl_ioctl(struct tty_struct *tty,
 	if (mgsl_paranoia_check(info, tty->name, "mgsl_ioctl"))
 		return -ENODEV;
 
-	if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) &&
-	    (cmd != TIOCMIWAIT)) {
+	if (cmd != TIOCMIWAIT) {
 		if (tty_io_error(tty))
 		    return -EIO;
 	}
diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
@@ -1029,8 +1029,7 @@ static int ioctl(struct tty_struct *tty,
 		return -ENODEV;
 	DBGINFO(("%s ioctl() cmd=%08X\n", info->device_name, cmd));
 
-	if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) &&
-	    (cmd != TIOCMIWAIT)) {
+	if (cmd != TIOCMIWAIT) {
 		if (tty_io_error(tty))
 		    return -EIO;
 	}
diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
@@ -1259,8 +1259,7 @@ static int ioctl(struct tty_struct *tty,
 	if (sanity_check(info, tty->name, "ioctl"))
 		return -ENODEV;
 
-	if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) &&
-	    (cmd != TIOCMIWAIT)) {
+	if (cmd != TIOCMIWAIT) {
 		if (tty_io_error(tty))
 		    return -EIO;
 	}

Original file line number	Diff line number	Diff line change
`@@ -2237,8 +2237,7 @@ static int mgslpc_ioctl(struct tty_struct *tty,`
`2237`	`2237`	`if (mgslpc_paranoia_check(info, tty->name, "mgslpc_ioctl"))`
`2238`	`2238`	`return -ENODEV;`
`2239`	`2239`
`2240`		`- if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) &&`
`2241`		`- (cmd != TIOCMIWAIT)) {`
	`2240`	`+ if (cmd != TIOCMIWAIT) {`
`2242`	`2241`	`if (tty_io_error(tty))`
`2243`	`2242`	`return -EIO;`
`2244`	`2243`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2959,8 +2959,7 @@ static int mgsl_ioctl(struct tty_struct *tty,`
`2959`	`2959`	`if (mgsl_paranoia_check(info, tty->name, "mgsl_ioctl"))`
`2960`	`2960`	`return -ENODEV;`
`2961`	`2961`
`2962`		`- if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) &&`
`2963`		`- (cmd != TIOCMIWAIT)) {`
	`2962`	`+ if (cmd != TIOCMIWAIT) {`
`2964`	`2963`	`if (tty_io_error(tty))`
`2965`	`2964`	`return -EIO;`
`2966`	`2965`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1029,8 +1029,7 @@ static int ioctl(struct tty_struct *tty,`
`1029`	`1029`	`return -ENODEV;`
`1030`	`1030`	`DBGINFO(("%s ioctl() cmd=%08X\n", info->device_name, cmd));`
`1031`	`1031`
`1032`		`- if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) &&`
`1033`		`- (cmd != TIOCMIWAIT)) {`
	`1032`	`+ if (cmd != TIOCMIWAIT) {`
`1034`	`1033`	`if (tty_io_error(tty))`
`1035`	`1034`	`return -EIO;`
`1036`	`1035`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1259,8 +1259,7 @@ static int ioctl(struct tty_struct *tty,`
`1259`	`1259`	`if (sanity_check(info, tty->name, "ioctl"))`
`1260`	`1260`	`return -ENODEV;`
`1261`	`1261`
`1262`		`- if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) &&`
`1263`		`- (cmd != TIOCMIWAIT)) {`
	`1262`	`+ if (cmd != TIOCMIWAIT) {`
`1264`	`1263`	`if (tty_io_error(tty))`
`1265`	`1264`	`return -EIO;`
`1266`	`1265`	`}`