Commit 22538565 authored Jun 10, 2020 by Johan Hovold Committed by Greg Kroah-Hartman Jun 27, 2020

serial: core: drop redundant sysrq checks

The sysrq timestamp will never be set unless port->has_sysrq is set (see
uart_handle_break()) so drop the redundant checks that were added by
commit 1997e9df ("serial_core: Un-ifdef sysrq SUPPORT_SYSRQ").

Signed-off-by: Johan Hovold <johan@kernel.org>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Dmitry Safonov <0x7f454c46@gmail.com>
Link: https://lore.kernel.org/r/20200610152232.16925-4-johan@kernel.org

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 08d54703

include/linux/serial_core.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -469,7 +469,7 @@ bool uart_try_toggle_sysrq(struct uart_port *port, unsigned int ch);

		static inline int uart_handle_sysrq_char(struct uart_port *port, unsigned int ch)
		{
		if (!port->has_sysrq \|\| !port->sysrq)
		if (!port->sysrq)
		return 0;

		if (ch && time_before(jiffies, port->sysrq)) {
		@@ -488,7 +488,7 @@ static inline int uart_handle_sysrq_char(struct uart_port *port, unsigned int ch

		static inline int uart_prepare_sysrq_char(struct uart_port *port, unsigned int ch)
		{
		if (!port->has_sysrq \|\| !port->sysrq)
		if (!port->sysrq)
		return 0;

		if (ch && time_before(jiffies, port->sysrq)) {