diff options
| author | Baruch Siach <baruch@tkos.co.il> | 2015-01-14 08:04:21 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-02-02 10:11:25 -0800 |
| commit | c0b18db0562738eee578b7cd2291bd2851f6b5f8 (patch) | |
| tree | 7b710d91f012f4846854aedb47b02b03dccc7c92 /drivers/tty | |
| parent | ee15947cf69a9ab035089670ee76160678eb5aa2 (diff) | |
| download | op-kernel-dev-c0b18db0562738eee578b7cd2291bd2851f6b5f8.zip op-kernel-dev-c0b18db0562738eee578b7cd2291bd2851f6b5f8.tar.gz | |
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>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/digicolor-usart.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/tty/serial/digicolor-usart.c b/drivers/tty/serial/digicolor-usart.c index 09ce0b3..a80cdad 100644 --- a/drivers/tty/serial/digicolor-usart.c +++ b/drivers/tty/serial/digicolor-usart.c @@ -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; @@ -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); |
