Commit c015b4ad authored by Ricardo Ribalda Delgado's avatar Ricardo Ribalda Delgado Committed by Greg Kroah-Hartman

serial/sc16is7xx: Remove obsolete #ifset TIOC[SG]RS485

Commit e676253b ("serial/8250: Add support for RS485 IOCTLs") added
references to TIOC[SG]RS48 on 8250_core.c. This change triggered the
need to define them in all the arches that uses tty/serial.

This made #ifdef TIOC[SG]RS48 obsolete.

Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Slaby <jslaby@suse.cz>
Cc: linux-serial@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarRicardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent aad31088
...@@ -830,7 +830,6 @@ static void sc16is7xx_set_termios(struct uart_port *port, ...@@ -830,7 +830,6 @@ static void sc16is7xx_set_termios(struct uart_port *port,
uart_update_timeout(port, termios->c_cflag, baud); uart_update_timeout(port, termios->c_cflag, baud);
} }
#if defined(TIOCSRS485) && defined(TIOCGRS485)
static void sc16is7xx_config_rs485(struct uart_port *port, static void sc16is7xx_config_rs485(struct uart_port *port,
struct serial_rs485 *rs485) struct serial_rs485 *rs485)
{ {
...@@ -848,12 +847,10 @@ static void sc16is7xx_config_rs485(struct uart_port *port, ...@@ -848,12 +847,10 @@ static void sc16is7xx_config_rs485(struct uart_port *port,
0); 0);
} }
} }
#endif
static int sc16is7xx_ioctl(struct uart_port *port, unsigned int cmd, static int sc16is7xx_ioctl(struct uart_port *port, unsigned int cmd,
unsigned long arg) unsigned long arg)
{ {
#if defined(TIOCSRS485) && defined(TIOCGRS485)
struct serial_rs485 rs485; struct serial_rs485 rs485;
switch (cmd) { switch (cmd) {
...@@ -872,7 +869,6 @@ static int sc16is7xx_ioctl(struct uart_port *port, unsigned int cmd, ...@@ -872,7 +869,6 @@ static int sc16is7xx_ioctl(struct uart_port *port, unsigned int cmd,
default: default:
break; break;
} }
#endif
return -ENOIOCTLCMD; return -ENOIOCTLCMD;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment