lkml.org 
[lkml]   [2019]   [Dec]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 54/58] serial_core: Remove SUPPORT_SYSRQ ifdeffery
Date
No one defines it anymore.

Signed-off-by: Dmitry Safonov <dima@arista.com>
---
include/linux/serial_core.h | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 5f761c399282..9cf1682dc580 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -466,10 +466,7 @@ uart_handle_sysrq_char(struct uart_port *port, unsigned int ch)
if (!IS_ENABLED(CONFIG_MAGIC_SYSRQ_SERIAL))
return 0;

- if (!port->has_sysrq && !IS_ENABLED(SUPPORT_SYSRQ))
- return 0;
-
- if (!port->sysrq)
+ if (!port->has_sysrq || !port->sysrq)
return 0;

if (ch && time_before(jiffies, port->sysrq)) {
@@ -487,10 +484,7 @@ uart_prepare_sysrq_char(struct uart_port *port, unsigned int ch)
if (!IS_ENABLED(CONFIG_MAGIC_SYSRQ_SERIAL))
return 0;

- if (!port->has_sysrq && !IS_ENABLED(SUPPORT_SYSRQ))
- return 0;
-
- if (!port->sysrq)
+ if (!port->has_sysrq || !port->sysrq)
return 0;

if (ch && time_before(jiffies, port->sysrq)) {
@@ -507,7 +501,7 @@ uart_unlock_and_check_sysrq(struct uart_port *port, unsigned long irqflags)
{
int sysrq_ch;

- if (!port->has_sysrq && !IS_ENABLED(SUPPORT_SYSRQ)) {
+ if (!port->has_sysrq) {
spin_unlock_irqrestore(&port->lock, irqflags);
return;
}
@@ -531,7 +525,7 @@ static inline int uart_handle_break(struct uart_port *port)
if (port->handle_break)
port->handle_break(port);

- if (port->has_sysrq || IS_ENABLED(SUPPORT_SYSRQ)) {
+ if (port->has_sysrq) {
if (port->cons && port->cons->index == port->line) {
if (!port->sysrq) {
port->sysrq = jiffies + HZ*5;
--
2.24.0
\
 
 \ /
  Last update: 2019-12-13 01:10    [W:0.030 / U:9.424 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site