Commit 212d9371 authored by Dmitry Safonov's avatar Dmitry Safonov Committed by Greg Kroah-Hartman
Browse files

tty/serial: Migrate sccnxp to use has_sysrq 



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: default avatarDmitry Safonov <dima@arista.com>
Link: https://lore.kernel.org/r/20191213000657.931618-40-dima@arista.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b2fc67b9

drivers/tty/serial/sccnxp.c

+1 −4
Original line number Diff line number Diff line
@@ -7,10 +7,6 @@ 
 *  Based on sc26xx.c, by Thomas Bogendörfer (tsbogend@alpha.franken.de)

 */



#if defined(CONFIG_SERIAL_SCCNXP_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)

#define SUPPORT_SYSRQ

#endif



#include <linux/clk.h>

#include <linux/delay.h>

#include <linux/err.h>
@@ -1000,6 +996,7 @@ static int sccnxp_probe(struct platform_device *pdev) 
		s->port[i].regshift	= s->pdata.reg_shift;

		s->port[i].uartclk	= uartclk;

		s->port[i].ops		= &sccnxp_ops;

		s->port[i].has_sysrq = IS_ENABLED(CONFIG_SERIAL_SCCNXP_CONSOLE);

		uart_add_one_port(&s->uart, &s->port[i]);

		/* Set direction to input */

		if (s->chip->flags & SCCNXP_HAVE_IO)