Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

tty/serial: Migrate pmac_zilog 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: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Paul Mackerras <paulus@samba.org>
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: Dmitry Safonov <dima@arista.com>
Link: https://lore.kernel.org/r/20191213000657.931618-32-dima@arista.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Dmitry Safonov and committed by
Greg Kroah-Hartman
f5e95c4f eff0a31d

+1 -4
+1 -4
drivers/tty/serial/pmac_zilog.c
··· 61 61 #define of_machine_is_compatible(x) (0) 62 62 #endif 63 63 64 - #if defined (CONFIG_SERIAL_PMACZILOG_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) 65 - #define SUPPORT_SYSRQ 66 - #endif 67 - 68 64 #include <linux/serial.h> 69 65 #include <linux/serial_core.h> 70 66 ··· 1717 1721 uap->control_reg = uap->port.membase; 1718 1722 uap->data_reg = uap->control_reg + 4; 1719 1723 uap->port_type = 0; 1724 + uap->port.has_sysrq = IS_ENABLED(CONFIG_SERIAL_PMACZILOG_CONSOLE); 1720 1725 1721 1726 pmz_convert_to_zs(uap, CS8, 0, 9600); 1722 1727