Commit c0b18db0 authored by Baruch Siach's avatar Baruch Siach Committed by Greg Kroah-Hartman

tty/serial: digicolor: remove sysrq reference

The Digicolor USART hardware does not support detecting the BREAK condition.
This means that we can't support sysrq on this hardware. Remove all reference
to sysrq from the code.

This also fixes build when sysrq is disabled:

drivers/tty/serial/digicolor-usart.c: In function 'digicolor_uart_console_write':
drivers/tty/serial/digicolor-usart.c:407:33: error: 'struct uart_port' has no member named 'sysrq'
Reported-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarBaruch Siach <baruch@tkos.co.il>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ee15947c
...@@ -170,9 +170,6 @@ static void digicolor_uart_rx(struct uart_port *port) ...@@ -170,9 +170,6 @@ static void digicolor_uart_rx(struct uart_port *port)
ch_flag = TTY_OVERRUN; ch_flag = TTY_OVERRUN;
} }
if (uart_handle_sysrq_char(port, ch))
continue;
if (status & port->ignore_status_mask) if (status & port->ignore_status_mask)
continue; continue;
...@@ -404,7 +401,7 @@ static void digicolor_uart_console_write(struct console *co, const char *c, ...@@ -404,7 +401,7 @@ static void digicolor_uart_console_write(struct console *co, const char *c,
unsigned long flags; unsigned long flags;
int locked = 1; int locked = 1;
if (port->sysrq || oops_in_progress) if (oops_in_progress)
locked = spin_trylock_irqsave(&port->lock, flags); locked = spin_trylock_irqsave(&port->lock, flags);
else else
spin_lock_irqsave(&port->lock, flags); spin_lock_irqsave(&port->lock, flags);
......
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