From: Dmitry Safonov Date: Fri, 13 Dec 2019 00:06:12 +0000 (+0000) Subject: tty/serial: Migrate clps711x to use has_sysrq X-Git-Tag: v5.10.7~3371^2~107 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=76f82db9730b600f4f3d0550d24262517cdb554e;p=platform%2Fkernel%2Flinux-rpi.git 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 Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Dmitry Safonov Link: https://lore.kernel.org/r/20191213000657.931618-14-dima@arista.com Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/tty/serial/clps711x.c b/drivers/tty/serial/clps711x.c index 0615907..95abc6f 100644 --- a/drivers/tty/serial/clps711x.c +++ b/drivers/tty/serial/clps711x.c @@ -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 #include #include @@ -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;