diff options
| author | Dmitry Safonov <dima@arista.com> | 2019-12-13 00:06:49 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-18 15:05:09 +0100 |
| commit | 0889d23e9a0a8efbc2cd686c6e730dabe08af21d (patch) | |
| tree | 97f6fc6ca2a93f56052621945dd94871f42bc9c5 /drivers/tty | |
| parent | 06129311c68cf381444f95d2baac956e9562fc3b (diff) | |
| download | linux-0889d23e9a0a8efbc2cd686c6e730dabe08af21d.tar.gz linux-0889d23e9a0a8efbc2cd686c6e730dabe08af21d.tar.bz2 linux-0889d23e9a0a8efbc2cd686c6e730dabe08af21d.zip | |
tty/serial: Migrate vr41xx_siu 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: Dmitry Safonov <dima@arista.com>
Link: https://lore.kernel.org/r/20191213000657.931618-51-dima@arista.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/vr41xx_siu.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/tty/serial/vr41xx_siu.c b/drivers/tty/serial/vr41xx_siu.c index 6d106e33f842..eeb4b6568776 100644 --- a/drivers/tty/serial/vr41xx_siu.c +++ b/drivers/tty/serial/vr41xx_siu.c @@ -7,10 +7,6 @@ * Based on drivers/serial/8250.c, by Russell King. */ -#if defined(CONFIG_SERIAL_VR41XX_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) -#define SUPPORT_SYSRQ -#endif - #include <linux/console.h> #include <linux/errno.h> #include <linux/init.h> @@ -869,6 +865,7 @@ static int siu_probe(struct platform_device *dev) port = &siu_uart_ports[i]; port->ops = &siu_uart_ops; port->dev = &dev->dev; + port->has_sysrq = IS_ENABLED(CONFIG_SERIAL_VR41XX_CONSOLE); retval = uart_add_one_port(&siu_uart_driver, port); if (retval < 0) { |