From 930236a30897532653a61ed22ae7eca13154accd Mon Sep 17 00:00:00 2001 From: Al Viro Date: Wed, 12 Sep 2018 07:46:51 -0400 Subject: [PATCH] complete ->[sg]et_serial() switchover Reviewed-by: Johan Hovold Signed-off-by: Al Viro --- drivers/tty/tty_io.c | 14 ++++---------- drivers/usb/serial/usb-serial.c | 4 ++-- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c index b96bfd051d59..15d60ba13187 100644 --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c @@ -2474,7 +2474,7 @@ static int tty_tiocsserial(struct tty_struct *tty, struct serial_struct __user * pr_warn("%s: '%s' is using deprecated serial flags (with no effect): %.8x\n", __func__, get_task_comm(comm, current), flags); if (!tty->ops->set_serial) - return -ENOIOCTLCMD; + return -ENOTTY; return tty->ops->set_serial(tty, &v); } @@ -2485,7 +2485,7 @@ static int tty_tiocgserial(struct tty_struct *tty, struct serial_struct __user * memset(&v, 0, sizeof(struct serial_struct)); if (!tty->ops->get_serial) - return -ENOIOCTLCMD; + return -ENOTTY; err = tty->ops->get_serial(tty, &v); if (!err && copy_to_user(ss, &v, sizeof(struct serial_struct))) err = -EFAULT; @@ -2621,15 +2621,9 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg) } break; case TIOCSSERIAL: - retval = tty_tiocsserial(tty, p); - if (retval != -ENOIOCTLCMD) - return retval; - break; + return tty_tiocsserial(tty, p); case TIOCGSERIAL: - retval = tty_tiocgserial(tty, p); - if (retval != -ENOIOCTLCMD) - return retval; - break; + return tty_tiocgserial(tty, p); case TIOCGPTPEER: /* Special because the struct file is needed */ return ptm_open_peer(file, tty, (int)arg); diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c index 0f96d82fc575..7e89efbf2c28 100644 --- a/drivers/usb/serial/usb-serial.c +++ b/drivers/usb/serial/usb-serial.c @@ -402,7 +402,7 @@ static int serial_get_serial(struct tty_struct *tty, struct serial_struct *ss) if (port->serial->type->get_serial) return port->serial->type->get_serial(tty, ss); - return -ENOIOCTLCMD; + return -ENOTTY; } static int serial_set_serial(struct tty_struct *tty, struct serial_struct *ss) @@ -411,7 +411,7 @@ static int serial_set_serial(struct tty_struct *tty, struct serial_struct *ss) if (port->serial->type->set_serial) return port->serial->type->set_serial(tty, ss); - return -ENOIOCTLCMD; + return -ENOTTY; } static int serial_ioctl(struct tty_struct *tty, -- 2.11.0