Commit e140ef36 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman

serial: core: Use uart_console() helper in SysRq code

Use uart_console() helper in SysRq code instead of open coded variant.
This eliminates the conditional entirely for SERIAL_CORE_CONSOLE=n case.
While here, refactor the conditional to be more compact.
Reviewed-by: default avatarDmitry Safonov <0x7f454c46@gmail.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20200310174337.74109-3-andriy.shevchenko@linux.intel.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b18896ff
...@@ -3216,14 +3216,12 @@ int uart_handle_break(struct uart_port *port) ...@@ -3216,14 +3216,12 @@ int uart_handle_break(struct uart_port *port)
if (port->handle_break) if (port->handle_break)
port->handle_break(port); port->handle_break(port);
if (port->has_sysrq) { if (port->has_sysrq && uart_console(port)) {
if (port->cons && port->cons->index == port->line) { if (!port->sysrq) {
if (!port->sysrq) { port->sysrq = jiffies + SYSRQ_TIMEOUT;
port->sysrq = jiffies + SYSRQ_TIMEOUT; return 1;
return 1;
}
port->sysrq = 0;
} }
port->sysrq = 0;
} }
if (port->flags & UPF_SAK) if (port->flags & UPF_SAK)
......
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