UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Baruch Siach 2015-01-14 08:04:21 +02:00 committed by Greg Kroah-Hartman
parent ee15947cf6
commit c0b18db056
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/tty/serial/digicolor-usart.c
View File

@ -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,
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);