On 3/10/20 1:20 PM, Andy Shevchenko wrote: > 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. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx> Thanks, Reviewed-by: Dmitry Safonov <0x7f454c46@xxxxxxxxx> > --- > drivers/tty/serial/serial_core.c | 12 +++++------- > 1 file changed, 5 insertions(+), 7 deletions(-) > > diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c > index e3f2afc15ad4..e3f8e641e3a7 100644 > --- a/drivers/tty/serial/serial_core.c > +++ b/drivers/tty/serial/serial_core.c > @@ -3315,14 +3315,12 @@ int uart_handle_break(struct uart_port *port) > if (port->handle_break) > port->handle_break(port); > > - if (port->has_sysrq) { > - if (port->cons && port->cons->index == port->line) { > - if (!port->sysrq) { > - port->sysrq = jiffies + SYSRQ_TIMEOUT; > - return 1; > - } > - port->sysrq = 0; > + if (port->has_sysrq && uart_console(port)) { > + if (!port->sysrq) { > + port->sysrq = jiffies + SYSRQ_TIMEOUT; > + return 1; > } > + port->sysrq = 0; > } > > if (port->flags & UPF_SAK) > Thanks, Dmitry