mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-13 22:25:03 +00:00
tty/serial: Migrate meson_uart 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: Kevin Hilman <khilman@baylibre.com> Cc: linux-arm-kernel@lists.infradead.org Cc: linux-amlogic@lists.infradead.org Signed-off-by: Dmitry Safonov <dima@arista.com> Link: https://lore.kernel.org/r/20191213000657.931618-22-dima@arista.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
79307e053f
commit
dca3ac8d3b
1 changed files with 1 additions and 4 deletions
|
@ -5,10 +5,6 @@
|
|||
* Copyright (C) 2014 Carlo Caione <carlo@caione.org>
|
||||
*/
|
||||
|
||||
#if defined(CONFIG_SERIAL_MESON_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
|
||||
#define SUPPORT_SYSRQ
|
||||
#endif
|
||||
|
||||
#include <linux/clk.h>
|
||||
#include <linux/console.h>
|
||||
#include <linux/delay.h>
|
||||
|
@ -703,6 +699,7 @@ static int meson_uart_probe(struct platform_device *pdev)
|
|||
port->mapsize = resource_size(res_mem);
|
||||
port->irq = res_irq->start;
|
||||
port->flags = UPF_BOOT_AUTOCONF | UPF_LOW_LATENCY;
|
||||
port->has_sysrq = IS_ENABLED(CONFIG_SERIAL_MESON_CONSOLE);
|
||||
port->dev = &pdev->dev;
|
||||
port->line = pdev->id;
|
||||
port->type = PORT_MESON;
|
||||
|
|
Loading…
Reference in a new issue