diff options
| author | Dmitry Safonov <dima@arista.com> | 2019-12-13 00:06:14 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-18 15:04:47 +0100 |
| commit | 881bdb443b5b5fffe918156fc3a751ecf3d1dbd3 (patch) | |
| tree | cfdd5452f4f02586a4c29e3dfe6a0ded17959ca9 | |
| parent | 410090d2f40abdfe076263bb8aea8c7815a2b873 (diff) | |
| download | linux-881bdb443b5b5fffe918156fc3a751ecf3d1dbd3.tar.gz linux-881bdb443b5b5fffe918156fc3a751ecf3d1dbd3.tar.bz2 linux-881bdb443b5b5fffe918156fc3a751ecf3d1dbd3.zip | |
tty/serial: Migrate dz 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: "Maciej W. Rozycki" <macro@linux-mips.org>
Signed-off-by: Dmitry Safonov <dima@arista.com>
Link: https://lore.kernel.org/r/20191213000657.931618-16-dima@arista.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/tty/serial/dz.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/tty/serial/dz.c b/drivers/tty/serial/dz.c index 7b57e840e255..6192ed011bc3 100644 --- a/drivers/tty/serial/dz.c +++ b/drivers/tty/serial/dz.c @@ -29,10 +29,6 @@ #undef DEBUG_DZ -#if defined(CONFIG_SERIAL_DZ_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) -#define SUPPORT_SYSRQ -#endif - #include <linux/bitops.h> #include <linux/compiler.h> #include <linux/console.h> @@ -787,6 +783,7 @@ static void __init dz_init_ports(void) uport->ops = &dz_ops; uport->line = line; uport->mapbase = base; + uport->has_sysrq = IS_ENABLED(CONFIG_SERIAL_DZ_CONSOLE); } } |