serial_core: Remove call to driver-specific TIO[GS]RS485]

Once there is no more handlers for TIOC[GS]RS485 there is no need to
call the driver specific ioctl when the generic implementation is
missing.

Reviewed-by: Alan Cox <alan@linux.intel.com>
Cc: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index ab4db1dcc474a3cd8cca58e1ff23808984f0face..99fcdba0e3e92cd52b15b10d93e97e04c8496e04 100644 (file)
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -1155,9 +1155,6 @@ static int uart_get_icount(struct tty_struct *tty,
 static int uart_get_rs485_config(struct uart_port *port,
                         struct serial_rs485 __user *rs485)
 {
-       if (!port->rs485_config)
-               return -ENOIOCTLCMD;
-
        if (copy_to_user(rs485, &port->rs485, sizeof(port->rs485)))
                return -EFAULT;
        return 0;
@@ -1255,7 +1252,12 @@ uart_ioctl(struct tty_struct *tty, unsigned int cmd,
         * All these rely on hardware being present and need to be
         * protected against the tty being hung up.
         */
+
        switch (cmd) {
+       case TIOCSERGETLSR: /* Get line status register */
+               ret = uart_get_lsr_info(tty, state, uarg);
+               break;
+
        case TIOCGRS485:
                ret = uart_get_rs485_config(state->uart_port, uarg);
                break;
@@ -1263,15 +1265,6 @@ uart_ioctl(struct tty_struct *tty, unsigned int cmd,
        case TIOCSRS485:
                ret = uart_set_rs485_config(state->uart_port, uarg);
                break;
-       }
-       if (ret != -ENOIOCTLCMD)
-               goto out;
-
-       switch (cmd) {
-       case TIOCSERGETLSR: /* Get line status register */
-               ret = uart_get_lsr_info(tty, state, uarg);
-               break;
-
        default: {
                struct uart_port *uport = state->uart_port;
                if (uport->ops->ioctl)