diff options
author | Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> | 2014-10-08 15:57:28 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-05 22:29:05 -0500 |
commit | c015b4ad2ae57e5f07a5d4f746835356056c8e03 (patch) | |
tree | 02e59e0d8fa464b788c86ec9b6ad86c5572784bb | |
parent | aad31088dbfe6016147469974f0cd6c3f3201f3e (diff) |
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>
-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, | |||
830 | uart_update_timeout(port, termios->c_cflag, baud); | 830 | uart_update_timeout(port, termios->c_cflag, baud); |
831 | } | 831 | } |
832 | 832 | ||
833 | #if defined(TIOCSRS485) && defined(TIOCGRS485) | ||
834 | static void sc16is7xx_config_rs485(struct uart_port *port, | 833 | static void sc16is7xx_config_rs485(struct uart_port *port, |
835 | struct serial_rs485 *rs485) | 834 | struct serial_rs485 *rs485) |
836 | { | 835 | { |
@@ -848,12 +847,10 @@ static void sc16is7xx_config_rs485(struct uart_port *port, | |||
848 | 0); | 847 | 0); |
849 | } | 848 | } |
850 | } | 849 | } |
851 | #endif | ||
852 | 850 | ||
853 | static int sc16is7xx_ioctl(struct uart_port *port, unsigned int cmd, | 851 | static int sc16is7xx_ioctl(struct uart_port *port, unsigned int cmd, |
854 | unsigned long arg) | 852 | unsigned long arg) |
855 | { | 853 | { |
856 | #if defined(TIOCSRS485) && defined(TIOCGRS485) | ||
857 | struct serial_rs485 rs485; | 854 | struct serial_rs485 rs485; |
858 | 855 | ||
859 | switch (cmd) { | 856 | switch (cmd) { |
@@ -872,7 +869,6 @@ static int sc16is7xx_ioctl(struct uart_port *port, unsigned int cmd, | |||
872 | default: | 869 | default: |
873 | break; | 870 | break; |
874 | } | 871 | } |
875 | #endif | ||
876 | 872 | ||
877 | return -ENOIOCTLCMD; | 873 | return -ENOIOCTLCMD; |
878 | } | 874 | } |