From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-serial@vger.kernel.org,
Dmitry Safonov <0x7f454c46@gmail.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v1 3/4] serial: core: Use uart_console() helper in SysRq code
Date: Tue, 10 Mar 2020 15:20:03 +0200 [thread overview]
Message-ID: <20200310132004.86367-3-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20200310132004.86367-1-andriy.shevchenko@linux.intel.com>
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@linux.intel.com>
---
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)
--
2.25.1
next prev parent reply other threads:[~2020-03-10 13:20 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-10 13:20 [PATCH v1 1/4] serial: core: Use string length for SysRq magic sequence Andy Shevchenko
2020-03-10 13:20 ` [PATCH v1 2/4] serial: core: Print escaped SysRq Magic sequence if enabled Andy Shevchenko
2020-03-10 14:40 ` Dmitry Safonov
2020-03-10 13:20 ` Andy Shevchenko [this message]
2020-03-10 14:43 ` [PATCH v1 3/4] serial: core: Use uart_console() helper in SysRq code Dmitry Safonov
2020-03-10 13:20 ` [PATCH v1 4/4] serial: core: Refactor uart_unlock_and_check_sysrq() Andy Shevchenko
2020-03-10 14:48 ` Dmitry Safonov
2020-03-10 15:30 ` Andy Shevchenko
2020-03-10 14:38 ` [PATCH v1 1/4] serial: core: Use string length for SysRq magic sequence Dmitry Safonov
2020-03-10 14:57 ` Andy Shevchenko
2020-03-10 15:33 ` Andy Shevchenko
2020-03-10 15:57 ` Dmitry Safonov
2020-03-10 16:48 ` Andy Shevchenko
2020-03-10 17:06 ` Dmitry Safonov
2020-03-10 17:06 ` Dmitry Safonov
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=20200310132004.86367-3-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=0x7f454c46@gmail.com \
--cc=gregkh@linuxfoundation.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.