Commit ebaa8c6f authored Dec 13, 2019 by Dmitry Safonov Committed by Greg Kroah-Hartman Dec 18, 2019

tty/serial: Migrate xilinx_uartps 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.

Cc: Michal Simek <michal.simek@xilinx.com>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Dmitry Safonov <dima@arista.com>
Link: https://lore.kernel.org/r/20191213000657.931618-53-dima@arista.com


Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 6e021166

drivers/tty/serial/xilinx_uartps.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -9,10 +9,6 @@
		* in the code.
		*/

		#if defined(CONFIG_SERIAL_XILINX_PS_UART_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
		#define SUPPORT_SYSRQ
		#endif

		#include <linux/platform_device.h>
		#include <linux/serial.h>
		#include <linux/console.h>
		@@ -1634,6 +1630,7 @@ static int cdns_uart_probe(struct platform_device *pdev)
		port->flags = UPF_BOOT_AUTOCONF;
		port->ops = &cdns_uart_ops;
		port->fifosize = CDNS_UART_FIFO_SIZE;
		port->has_sysrq = IS_ENABLED(CONFIG_SERIAL_XILINX_PS_UART_CONSOLE);

		/*
		* Register the port.

Admin message