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

tty/serial: Migrate clps711x 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: Alexander Shiyan <shc_work@mail.ru>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: default avatarDmitry Safonov <dima@arista.com>
Link: https://lore.kernel.org/r/20191213000657.931618-14-dima@arista.com


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

drivers/tty/serial/clps711x.c

+1 −4
Original line number Diff line number Diff line
@@ -8,10 +8,6 @@ 
 *  Copyright (C) 2000 Deep Blue Solutions Ltd.

 */



#if defined(CONFIG_SERIAL_CLPS711X_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)

#define SUPPORT_SYSRQ

#endif



#include <linux/module.h>

#include <linux/device.h>

#include <linux/console.h>
@@ -479,6 +475,7 @@ static int uart_clps711x_probe(struct platform_device *pdev) 
	s->port.mapbase		= res->start;

	s->port.type		= PORT_CLPS711X;

	s->port.fifosize	= 16;

	s->port.has_sysrq	= IS_ENABLED(CONFIG_SERIAL_CLPS711X_CONSOLE);

	s->port.flags		= UPF_SKIP_TEST | UPF_FIXED_TYPE;

	s->port.uartclk		= clk_get_rate(uart_clk);

	s->port.ops		= &uart_clps711x_ops;