2020-06-10 17:11:13

by Johan Hovold

Subject: [PATCH v2 3/3] 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 1997e9dfdc84 ("serial_core: Un-ifdef sysrq SUPPORT_SYSRQ").

Signed-off-by: Johan Hovold <[email protected]>
---
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 03fa7b967103..791f4844efeb 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -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)) {
--
2.26.2

2020-06-12 15:58:20

by Dmitry Safonov

Subject: Re: [PATCH v2 3/3] serial: core: drop redundant sysrq checks

On 6/10/20 4:22 PM, Johan Hovold wrote:
> 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 1997e9dfdc84 ("serial_core: Un-ifdef sysrq SUPPORT_SYSRQ").
>
> Signed-off-by: Johan Hovold <[email protected]>

Reviewed-by: Dmitry Safonov <[email protected]>

Thanks,
Dmitry