redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
hifive-unleashed-5.1
Ricardo Ribalda Delgado 2014-11-06 09:22:59 +01:00 committed by Greg Kroah-Hartman
parent c267d679cf
commit a9c20a9cf3
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/tty/serial/serial_core.c
View File

@ -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)