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

tty/serial: Migrate omap-serial 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-29-dima@arista.com


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

drivers/tty/serial/omap-serial.c

+1 −4
Original line number Diff line number Diff line
@@ -16,10 +16,6 @@ 
 * this driver as required for the omap-platform.

 */



#if defined(CONFIG_SERIAL_OMAP_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)

#define SUPPORT_SYSRQ

#endif



#include <linux/module.h>

#include <linux/init.h>

#include <linux/console.h>
@@ -1683,6 +1679,7 @@ static int serial_omap_probe(struct platform_device *pdev) 
	up->port.regshift = 2;

	up->port.fifosize = 64;

	up->port.ops = &serial_omap_pops;

	up->port.has_sysrq = IS_ENABLED(CONFIG_SERIAL_OMAP_CONSOLE);



	if (pdev->dev.of_node)

		ret = of_alias_get_id(pdev->dev.of_node, "serial");