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

tty/serial: Migrate samsung_tty 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: Dmitry Safonov <dima@arista.com>
Link: https://lore.kernel.org/r/20191213000657.931618-38-dima@arista.com


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

parent 5e637d2b

drivers/tty/serial/samsung_tty.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -21,10 +21,6 @@
		* BJD, 04-Nov-2004
		*/

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

		#include <linux/dmaengine.h>
		#include <linux/dma-mapping.h>
		#include <linux/slab.h>
		@@ -2012,6 +2008,7 @@ static int s3c24xx_serial_probe(struct platform_device *pdev)
		ourport->port.fifosize = ourport->drv_data->fifosize[index];
		else if (ourport->info->fifosize)
		ourport->port.fifosize = ourport->info->fifosize;
		ourport->port.has_sysrq = IS_ENABLED(CONFIG_SERIAL_SAMSUNG_CONSOLE);

		/*
		* DMA transfers must be aligned at least to cache line size,

Admin message