tty/serial: digicolor: remove sysrq reference
authorBaruch Siach <baruch@tkos.co.il>
Wed, 14 Jan 2015 06:04:21 +0000 (08:04 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 2 Feb 2015 18:11:25 +0000 (10:11 -0800)
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>
drivers/tty/serial/digicolor-usart.c

index 09ce0b3764e29f70ea997283a8cc3fac89928f65..a80cdad114f305ecbd64fe0f37615b0faca9950f 100644 (file)
@@ -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);