tty/serial: Migrate sh-sci to use has_sysrq (dc9a3254) · Commits · 戴 / test

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-42-dima@arista.com Signed-off-by:

Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/tty/serial/sh-sci.c

+2 −8

Original line number	Diff line number	Diff line
		@@ -15,10 +15,6 @@
		* Modified to support SH7300 SCIF. Takashi Kusuda (Jun 2003).
		* Removed SH7300 support (Jul 2007).
		*/
		#if defined(CONFIG_SERIAL_SH_SCI_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
		#define SUPPORT_SYSRQ
		#endif

		#undef DEBUG

		#include <linux/clk.h>
		@@ -2887,6 +2883,7 @@ static int sci_init_single(struct platform_device *dev,
		port->ops = &sci_uart_ops;
		port->iotype = UPIO_MEM;
		port->line = index;
		port->has_sysrq = IS_ENABLED(CONFIG_SERIAL_SH_SCI_CONSOLE);

		res = platform_get_resource(dev, IORESOURCE_MEM, 0);
		if (res == NULL)
		@@ -3015,12 +3012,9 @@ static void serial_console_write(struct console co, const char s,
		unsigned long flags;
		int locked = 1;

		#if defined(SUPPORT_SYSRQ)
		if (port->sysrq)
		locked = 0;
		else
		#endif
		if (oops_in_progress)
		else if (oops_in_progress)
		locked = spin_trylock_irqsave(&port->lock, flags);
		else
		spin_lock_irqsave(&port->lock, flags);

Admin message