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 <gre...@linuxfoundation.org>
Cc: Jiri Slaby <jsl...@suse.cz>
Cc: linux-ser...@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
---
drivers/tty/serial/sc16is7xx.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c
index 3284c31..3ab5d1b 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;
}
--
2.1.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
