Messages in this thread Patch in this message | | | From | Johan Hovold <> | Subject | [PATCH 4/4] serial: core: drop redundant sysrq checks | Date | Tue, 2 Jun 2020 16:00:58 +0200 |
| |
The sysrq timestamp will never be set unless port->has_sysrq so drop the redundant checks that where added by commit 1997e9dfdc84 ("serial_core: Un-ifdef sysrq SUPPORT_SYSRQ").
Signed-off-by: Johan Hovold <johan@kernel.org> --- include/linux/serial_core.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index a8a213b71553..2f6c3cfe2ae7 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -468,7 +468,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)) { @@ -487,7 +487,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)) { -- 2.26.2
| |