Skip to content

Commit

Permalink
tty/serial: digicolor: remove sysrq reference
Browse files Browse the repository at this point in the history
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: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Baruch Siach authored and Greg Kroah-Hartman committed Feb 2, 2015
1 parent ee15947 commit c0b18db
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions drivers/tty/serial/digicolor-usart.c
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,6 @@ static void digicolor_uart_rx(struct uart_port *port)
ch_flag = TTY_OVERRUN;
}

if (uart_handle_sysrq_char(port, ch))
continue;

if (status & port->ignore_status_mask)
continue;

Expand Down Expand Up @@ -404,7 +401,7 @@ static void digicolor_uart_console_write(struct console *co, const char *c,
unsigned long flags;
int locked = 1;

if (port->sysrq || oops_in_progress)
if (oops_in_progress)
locked = spin_trylock_irqsave(&port->lock, flags);
else
spin_lock_irqsave(&port->lock, flags);
Expand Down

0 comments on commit c0b18db

Please sign in to comment.