]> git.karo-electronics.de Git - linux-beck.git/commitdiff
serial/max310x: Remove obsolete #ifset TIOC[SG]RS485
authorRicardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Wed, 8 Oct 2014 19:57:27 +0000 (21:57 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 6 Nov 2014 03:29:05 +0000 (19:29 -0800)
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>
drivers/tty/serial/max310x.c

index 4cdc555604c9b10121a03ddeaf15ec436a35dcf2..ecb466701ede7c7589d98aa89202ebee13edaee4 100644 (file)
@@ -880,7 +880,6 @@ static void max310x_set_termios(struct uart_port *port,
 static int max310x_ioctl(struct uart_port *port, unsigned int cmd,
                         unsigned long arg)
 {
-#if defined(TIOCSRS485) && defined(TIOCGRS485)
        struct serial_rs485 rs485;
        unsigned int val;
 
@@ -923,7 +922,6 @@ static int max310x_ioctl(struct uart_port *port, unsigned int cmd,
        default:
                break;
        }
-#endif
 
        return -ENOIOCTLCMD;
 }