leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tty/serial: Migrate fsl_linflexuart to use has_sysrq

Browse Source 
The SUPPORT_SYSRQ ifdeffery is not nice as:
- May create misunderstanding about sizeof(struct uart_port) between
  different objects
- Prevents moving functions from serial_core.h
- Reduces readability (well, it's ifdeffery - it's hard to follow)

In order to remove SUPPORT_SYSRQ, has_sysrq variable has been added.
Initialise it in driver's probe and remove ifdeffery.

Signed-off-by: Dmitry Safonov <dima@arista.com>
Link: https://lore.kernel.org/r/20191213000657.931618-18-dima@arista.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Dmitry Safonov 2019-12-13 00:06:16 +00:00 committed by Greg Kroah-Hartman
parent 79bb662548
commit 4151bbed79
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/tty/serial/fsl_linflexuart.c
View File

@ -6,11 +6,6 @@
* Copyright 2017-2019 NXP * Copyright 2017-2019 NXP
*/ */
#if defined(CONFIG_SERIAL_FSL_LINFLEXUART_CONSOLE) && \
defined(CONFIG_MAGIC_SYSRQ)
#define SUPPORT_SYSRQ
#endif
#include <linux/console.h> #include <linux/console.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/irq.h> #include <linux/irq.h>
@ -279,10 +274,8 @@ static irqreturn_t linflex_rxint(int irq, void *dev_id)
if (brk) { if (brk) {
uart_handle_break(sport); uart_handle_break(sport);
} else { } else {
#ifdef SUPPORT_SYSRQ
if (uart_handle_sysrq_char(sport, (unsigned char)rx)) if (uart_handle_sysrq_char(sport, (unsigned char)rx))
continue; continue;
#endif
tty_insert_flip_char(port, rx, flg); tty_insert_flip_char(port, rx, flg);
} }
} }
@ -863,6 +856,7 @@ static int linflex_probe(struct platform_device *pdev)
sport->irq = platform_get_irq(pdev, 0); sport->irq = platform_get_irq(pdev, 0);
sport->ops = &linflex_pops; sport->ops = &linflex_pops;
sport->flags = UPF_BOOT_AUTOCONF; sport->flags = UPF_BOOT_AUTOCONF;
sport->has_sysrq = IS_ENABLED(CONFIG_SERIAL_FSL_LINFLEXUART_CONSOLE);
linflex_ports[sport->line] = sport; linflex_ports[sport->line] = sport;