Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f82fc0fe authored Sep 12, 2018 by Al Viro

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>

parent 930236a3

drivers/char/pcmcia/synclink_cs.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}

drivers/tty/synclink.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}

drivers/tty/synclink_gt.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}

drivers/tty/synclinkmp.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}