diff options
| author |   Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> | 2014-10-08 21:57:28 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-05 19:29:05 -0800 |
| commit | c015b4ad2ae57e5f07a5d4f746835356056c8e03 (patch) | |
| tree | 02e59e0d8fa464b788c86ec9b6ad86c5572784bb /drivers/tty/serial/sc16is7xx.c | |
| parent | serial/max310x: Remove obsolete #ifset TIOC[SG]RS485 (diff) | |
| download | linux-dev-c015b4ad2ae57e5f07a5d4f746835356056c8e03.tar.xz linux-dev-c015b4ad2ae57e5f07a5d4f746835356056c8e03.zip | |
serial/sc16is7xx: Remove obsolete #ifset TIOC[SG]RS485
Commit e676253b19b2 ("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: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/sc16is7xx.c')
| -rw-r--r-- | drivers/tty/serial/sc16is7xx.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c index 6246820d7f05..7a7911384eca 100644 --- a/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c @@ -830,7 +830,6 @@ static void sc16is7xx_set_termios(struct uart_port *port, uart_update_timeout(port, termios->c_cflag, baud); } -#if defined(TIOCSRS485) && defined(TIOCGRS485) static void sc16is7xx_config_rs485(struct uart_port *port, struct serial_rs485 *rs485) { @@ -848,12 +847,10 @@ static void sc16is7xx_config_rs485(struct uart_port *port, 0); } } -#endif static int sc16is7xx_ioctl(struct uart_port *port, unsigned int cmd, unsigned long arg) { -#if defined(TIOCSRS485) && defined(TIOCGRS485) struct serial_rs485 rs485; switch (cmd) { @@ -872,7 +869,6 @@ static int sc16is7xx_ioctl(struct uart_port *port, unsigned int cmd, default: break; } -#endif return -ENOIOCTLCMD; } |