From: Johan Hovold <johan@kernel.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Slaby <jslaby@suse.com>,
Dmitry Safonov <0x7f454c46@gmail.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org,
Johan Hovold <johan@kernel.org>
Subject: [PATCH 4/4] serial: core: drop redundant sysrq checks
Date: Tue, 2 Jun 2020 16:00:58 +0200 [thread overview]
Message-ID: <20200602140058.3656-5-johan@kernel.org> (raw)
In-Reply-To: <20200602140058.3656-1-johan@kernel.org>
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
prev parent reply other threads:[~2020-06-02 14:01 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-02 14:00 [PATCH 0/4] serial: core: fix up sysrq regressions Johan Hovold
2020-06-02 14:00 ` [PATCH 1/4] Revert "serial: core: Refactor uart_unlock_and_check_sysrq()" Johan Hovold
2020-06-02 14:00 ` [PATCH 2/4] serial: core: fix broken sysrq port unlock Johan Hovold
2020-06-02 14:48 ` Andy Shevchenko
2020-06-02 15:34 ` Dmitry Safonov
2020-06-03 8:40 ` Johan Hovold
2020-06-03 9:13 ` Johan Hovold
2020-06-02 14:00 ` [PATCH 3/4] serial: core: fix sysrq overhead regression Johan Hovold
2020-06-02 14:00 ` Johan Hovold [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200602140058.3656-5-johan@kernel.org \
--to=johan@kernel.org \
--cc=0x7f454c46@gmail.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=jslaby@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).