Skip to content

serial/sysrq: Cleanup ifdeffery

Dmitry Safonov linux-amlogic linux-arm-kernel linux-arm-msm linux-aspeed linux-fsdevel linux-serial linuxppc-dev lkml sparclinux 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest58 patches 12 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/58sysrq: Remove sysrq_handler_registereddrivers/tty/sysrq.c+1 -80 replies
2/58serial: Move sysrq members aboveinclude/linux/serial_core.h+6 -51 reply
3/58serial_core: Un-ifdef sysrq SUPPORT_SYSRQinclude/linux/serial_core.h+43 -343 replies
4/58tty/serial: Migrate aspeed_vuart to use has_sysrqdrivers/tty/serial/8250/8250_aspeed_vuart.c+1 -41 reply
5/58tty/serial: Migrate 8250_fsl to use has_sysrqarch/powerpc/kernel/legacy_serial.c drivers/tty/serial/8250/8250_fsl.c drivers/tty/serial/8250/8250_of.c+6 -60 replies
6/58tty/serial: Migrate bcm63xx_uart to use has_sysrqdrivers/tty/serial/bcm63xx_uart.c+1 -40 replies
7/58tty/serial: Migrate 8250_omap to use has_sysrqdrivers/tty/serial/8250/8250_omap.c+1 -40 replies
8/58tty/serial: Migrate 8250_port to use has_sysrqdrivers/tty/serial/8250/8250_port.c+1 -40 replies
9/58tty/serial: Migrate amba-pl01* to use has_sysrqdrivers/tty/serial/amba-pl010.c drivers/tty/serial/amba-pl011.c+2 -90 replies
10/58tty/serial: Migrate apbuart to use has_sysrqdrivers/tty/serial/apbuart.c+1 -40 replies
11/58tty/serial: Migrate arc_uart to use has_sysrqdrivers/tty/serial/arc_uart.c+1 -40 replies
12/58tty/serial: Migrate atmel_serial to use has_sysrqdrivers/tty/serial/atmel_serial.c+1 -80 replies
13/58tty/serial: Migrate clps711x to use has_sysrqdrivers/tty/serial/clps711x.c+1 -40 replies
14/58tty/serial: Migrate cpm_uart to use has_sysrqdrivers/tty/serial/cpm_uart/cpm_uart_core.c+2 -70 replies
15/58tty/serial: Migrate dz to use has_sysrqdrivers/tty/serial/dz.c+1 -40 replies
16/58tty/serial: Migrate efm32-uart to use has_sysrqdrivers/tty/serial/efm32-uart.c+1 -40 replies
17/58tty/serial: Migrate fsl_linflexuart to use has_sysrqdrivers/tty/serial/fsl_linflexuart.c+1 -70 replies
18/58tty/serial: Migrate fsl_lpuart to use has_sysrqdrivers/tty/serial/fsl_lpuart.c+1 -80 replies
19/58tty/serial: Migrate imx to use has_sysrqdrivers/tty/serial/imx.c+1 -60 replies
20/58tty/serial: Migrate ip22zilog to use has_sysrqdrivers/tty/serial/ip22zilog.c+3 -40 replies
21/58tty/serial: Migrate meson_uart to use has_sysrqdrivers/tty/serial/meson_uart.c+1 -40 replies
22/58tty/serial: Migrate milbeaut_usio to use has_sysrqdrivers/tty/serial/milbeaut_usio.c+1 -40 replies
23/58tty/serial: Migrate mpc52xx_uart to use has_sysrqdrivers/tty/serial/mpc52xx_uart.c+1 -60 replies
24/58tty/serial: Don't zero port->sysrqdrivers/tty/serial/mpc52xx_uart.c+1 -30 replies
25/58tty/serial: Migrate msm_serial to use has_sysrqdrivers/tty/serial/msm_serial.c+1 -40 replies
26/58tty/serial: Migrate mux to use has_sysrqdrivers/tty/serial/mux.c+1 -40 replies
27/58tty/serial: Migrate mxs-auart to use has_sysrqdrivers/tty/serial/mxs-auart.c+1 -40 replies
28/58tty/serial: Migrate omap-serial to use has_sysrqdrivers/tty/serial/omap-serial.c+1 -40 replies
29/58tty/serial: Migrate pch_uart to use has_sysrqdrivers/tty/serial/pch_uart.c+1 -50 replies
30/58tty/serial: Don't check port->sysrqdrivers/tty/serial/pch_uart.c+2 -40 replies
31/58tty/serial: Migrate pmac_zilog to use has_sysrqdrivers/tty/serial/pmac_zilog.c+1 -40 replies
32/58tty/serial: Migrate pnx8xxx_uart to use has_sysrqdrivers/tty/serial/pnx8xxx_uart.c+1 -60 replies
33/58serial/f81534: Don't check port->sysrqdrivers/usb/serial/f81534.c+2 -42 replies
34/58tty/serial: Migrate pxa to use has_sysrqdrivers/tty/serial/pxa.c+1 -40 replies
35/58tty/serial: Migrate qcom_geni_serial to use has_sysrqdrivers/tty/serial/qcom_geni_serial.c+1 -40 replies
36/58tty/serial: Migrate sa1100 to use has_sysrqdrivers/tty/serial/sa1100.c+1 -60 replies
37/58tty/serial: Migrate samsung_tty to use has_sysrqdrivers/tty/serial/samsung_tty.c+1 -40 replies
38/58tty/serial: Migrate sb1250-duart to use has_sysrqdrivers/tty/serial/sb1250-duart.c+1 -40 replies
39/58tty/serial: Migrate sccnxp to use has_sysrqdrivers/tty/serial/sccnxp.c+1 -40 replies
40/58tty/serial: Migrate serial_txx9 to use has_sysrqdrivers/tty/serial/serial_txx9.c+1 -40 replies
41/58tty/serial: Migrate sh-sci to use has_sysrqdrivers/tty/serial/sh-sci.c+2 -80 replies
42/58tty/serial: Migrate sprd_serial to use has_sysrqdrivers/tty/serial/sprd_serial.c+1 -41 reply
43/58tty/serial: Migrate st-asc to use has_sysrqdrivers/tty/serial/st-asc.c+1 -40 replies
44/58tty/serial: Migrate stm32-usart to use has_sysrqdrivers/tty/serial/stm32-usart.c+1 -40 replies
45/58tty/serial: Migrate sunhv to use has_sysrqdrivers/tty/serial/sunhv.c+1 -40 replies
46/58tty/serial: Migrate sunsab to use has_sysrqdrivers/tty/serial/sunsab.c+1 -40 replies
47/58tty/serial: Migrate sunsu to use has_sysrqdrivers/tty/serial/sunsu.c+1 -40 replies
48/58tty/serial: Migrate sunzilog to use has_sysrqdrivers/tty/serial/sunzilog.c+2 -40 replies
49/58serial/ucc_uart: Remove ifdef SUPPORT_SYSRQdrivers/tty/serial/ucc_uart.c+0 -20 replies
50/58tty/serial: Migrate vr41xx_siu to use has_sysrqdrivers/tty/serial/vr41xx_siu.c+1 -40 replies
51/58tty/serial: Migrate vt8500_serial to use has_sysrqdrivers/tty/serial/vt8500_serial.c+1 -40 replies
52/58tty/serial: Migrate xilinx_uartps to use has_sysrqdrivers/tty/serial/xilinx_uartps.c+1 -40 replies
53/58tty/serial: Migrate zs to use has_sysrqdrivers/tty/serial/zs.c+1 -40 replies
54/58serial_core: Remove SUPPORT_SYSRQ ifdefferyinclude/linux/serial_core.h+4 -102 replies
55/58usb/serial: Don't handle break when CONFIG_MAGIC_SYSRQ is disableddrivers/usb/serial/generic.c+3 -70 replies
56/58serial_core: Move sysrq functions from header filedrivers/tty/serial/serial_core.c include/linux/serial_core.h+88 -790 replies
57/58sysctl/sysrq: Remove __sysrq_enabled copydrivers/tty/sysrq.c include/linux/sysrq.h kernel/sysctl.c+30 -190 replies
58/58serial/sysrq: Add MAGIC_SYSRQ_SERIAL_SEQUENCEdrivers/tty/serial/serial_core.c include/linux/serial_core.h lib/Kconfig.debug+55 -70 replies

Reviews trailers per patch

2 of 58 patches have a Reviewed-by or Acked-by.

PatchVasiliy KhoruzhickAndrew JefferyChunyan Zhang
1/58
2/58
3/58
4/58A-b
5/58
6/58
7/58
8/58
9/58
10/58
11/58
12/58
13/58
14/58
15/58
16/58
17/58
18/58
19/58
20/58
21/58
22/58
23/58
24/58
25/58
26/58
27/58
28/58
29/58
30/58
31/58
32/58
33/58
34/58
35/58
36/58
37/58
38/58
39/58
40/58
41/58
42/58A-b
43/58
44/58
45/58
46/58
47/58
48/58
49/58
50/58
51/58
52/58
53/58
54/58
55/58
56/58
57/58
58/58Based-on-patch-by

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v1 thread

Cover letter [PATCH 00/58] serial/sysrq: Cleanup ifdeffery

The original purpose of the patches set was to add a way to enable sysrq on a uart where currently it can be constantly either on or off (CONFIG_MAGIC_SYSRQ_SERIAL), see the last patch:
"serial/sysrq: Add MAGIC_SYSRQ_SERIAL_SEQUENCE"

But to do that, I had to add uart_try_toggle_sysrq() and I didn't want to bloat serial_core.h even more. So, I did cleanup by removing SUPPORT_SYSRQ resulting in a nice diff-stat and lesser ifdeffery.

Most patches are one-liners, I decided to keep them separated per-driver to let reviewers easier follow the purpose.

Cc Greg Kroah-Hartman <[email protected]>
Cc Jiri Slaby <[email protected]>
Cc Vasiliy Khoruzhick <[email protected]>
Cc linux-serial at vger.kernel.org

Dmitry Safonov (58):
sysrq: Remove sysrq_handler_registered
serial: Move sysrq members above
serial_core: Un-ifdef sysrq SUPPORT_SYSRQ
tty/serial: Migrate aspeed_vuart to use has_sysrq tty/serial: Migrate 8250_fsl to use has_sysrq tty/serial: Migrate bcm63xx_uart to use has_sysrq tty/serial: Migrate 8250_omap to use has_sysrq tty/serial: Migrate 8250_port to use has_sysrq tty/serial: Migrate amba-pl01* to use has_sysrq tty/serial: Migrate apbuart to use has_sysrq tty/serial: Migrate arc_uart to use has_sysrq tty/serial: Migrate atmel_serial to use has_sysrq tty/serial: Migrate clps711x to use has_sysrq tty/serial: Migrate cpm_uart to use has_sysrq tty/serial: Migrate dz to use has_sysrq
tty/serial: Migrate efm32-uart to use has_sysrq tty/serial: Migrate fsl_linflexuart to use has_sysrq tty/serial: Migrate fsl_lpuart to use has_sysrq tty/serial: Migrate imx to use has_sysrq
tty/serial: Migrate ip22zilog to use has_sysrq tty/serial: Migrate meson_uart to use has_sysrq tty/serial: Migrate milbeaut_usio to use has_sysrq tty/serial: Migrate mpc52xx_uart to use has_sysrq tty/serial: Don't zero port->sysrq
tty/serial: Migrate msm_serial to use has_sysrq tty/serial: Migrate mux to use has_sysrq
tty/serial: Migrate mxs-auart to use has_sysrq tty/serial: Migrate omap-serial to use has_sysrq tty/serial: Migrate pch_uart to use has_sysrq tty/serial: Don't check port->sysrq
tty/serial: Migrate pmac_zilog to use has_sysrq tty/serial: Migrate pnx8xxx_uart to use has_sysrq serial/f81534: Don't check port->sysrq
tty/serial: Migrate pxa to use has_sysrq
tty/serial: Migrate qcom_geni_serial to use has_sysrq tty/serial: Migrate sa1100 to use has_sysrq
tty/serial: Migrate samsung_tty to use has_sysrq tty/serial: Migrate sb1250-duart to use has_sysrq tty/serial: Migrate sccnxp to use has_sysrq
tty/serial: Migrate serial_txx9 to use has_sysrq tty/serial: Migrate sh-sci to use has_sysrq
tty/serial: Migrate sprd_serial to use has_sysrq tty/serial: Migrate st-asc to use has_sysrq
tty/serial: Migrate stm32-usart to use has_sysrq tty/serial: Migrate sunhv to use has_sysrq
tty/serial: Migrate sunsab to use has_sysrq
tty/serial: Migrate sunsu to use has_sysrq
tty/serial: Migrate sunzilog to use has_sysrq serial/ucc_uart: Remove ifdef SUPPORT_SYSRQ
tty/serial: Migrate vr41xx_siu to use has_sysrq tty/serial: Migrate vt8500_serial to use has_sysrq tty/serial: Migrate xilinx_uartps to use has_sysrq tty/serial: Migrate zs to use has_sysrq
serial_core: Remove SUPPORT_SYSRQ ifdeffery
usb/serial: Don't handle break when CONFIG_MAGIC_SYSRQ is disabled
serial_core: Move sysrq functions from header file sysctl/sysrq: Remove __sysrq_enabled copy
serial/sysrq: Add MAGIC_SYSRQ_SERIAL_SEQUENCE

 arch/powerpc/kernel/legacy_serial.c         |   4 +-
 drivers/tty/serial/8250/8250_aspeed_vuart.c |   5 +-
 drivers/tty/serial/8250/8250_fsl.c          |   4 -
 drivers/tty/serial/8250/8250_of.c           |   4 +-
 drivers/tty/serial/8250/8250_omap.c         |   5 +-
 drivers/tty/serial/8250/8250_port.c         |   5 +-
 drivers/tty/serial/amba-pl010.c             |   5 +-
 drivers/tty/serial/amba-pl011.c             |   6 +-
 drivers/tty/serial/apbuart.c                |   5 +-
 drivers/tty/serial/arc_uart.c               |   5 +-
 drivers/tty/serial/atmel_serial.c           |   9 +-
 drivers/tty/serial/bcm63xx_uart.c           |   5 +-
 drivers/tty/serial/clps711x.c               |   5 +-
 drivers/tty/serial/cpm_uart/cpm_uart_core.c |   9 +-
 drivers/tty/serial/dz.c                     |   5 +-
 drivers/tty/serial/efm32-uart.c             |   5 +-
 drivers/tty/serial/fsl_linflexuart.c        |   8 +-
 drivers/tty/serial/fsl_lpuart.c             |   9 +-
 drivers/tty/serial/imx.c                    |   7 +-
 drivers/tty/serial/ip22zilog.c              |   7 +-
 drivers/tty/serial/meson_uart.c             |   5 +-
 drivers/tty/serial/milbeaut_usio.c          |   5 +-
 drivers/tty/serial/mpc52xx_uart.c           |  11 +-
 drivers/tty/serial/msm_serial.c             |   5 +-
 drivers/tty/serial/mux.c                    |   5 +-
 drivers/tty/serial/mxs-auart.c              |   5 +-
 drivers/tty/serial/omap-serial.c            |   5 +-
 drivers/tty/serial/pch_uart.c               |  12 +-
 drivers/tty/serial/pmac_zilog.c             |   5 +-
 drivers/tty/serial/pnx8xxx_uart.c           |   7 +-
 drivers/tty/serial/pxa.c                    |   5 +-
 drivers/tty/serial/qcom_geni_serial.c       |   5 +-
 drivers/tty/serial/sa1100.c                 |   7 +-
 drivers/tty/serial/samsung_tty.c            |   5 +-
 drivers/tty/serial/sb1250-duart.c           |   5 +-
 drivers/tty/serial/sccnxp.c                 |   5 +-
 drivers/tty/serial/serial_core.c            | 123 ++++++++++++++++++++
 drivers/tty/serial/serial_txx9.c            |   5 +-
 drivers/tty/serial/sh-sci.c                 |  10 +-
 drivers/tty/serial/sprd_serial.c            |   5 +-
 drivers/tty/serial/st-asc.c                 |   5 +-
 drivers/tty/serial/stm32-usart.c            |   5 +-
 drivers/tty/serial/sunhv.c                  |   5 +-
 drivers/tty/serial/sunsab.c                 |   5 +-
 drivers/tty/serial/sunsu.c                  |   5 +-
 drivers/tty/serial/sunzilog.c               |   6 +-
 drivers/tty/serial/ucc_uart.c               |   2 -
 drivers/tty/serial/vr41xx_siu.c             |   5 +-
 drivers/tty/serial/vt8500_serial.c          |   5 +-
 drivers/tty/serial/xilinx_uartps.c          |   5 +-
 drivers/tty/serial/zs.c                     |   5 +-
 drivers/tty/sysrq.c                         |  16 +--
 drivers/usb/serial/f81534.c                 |   6 +-
 drivers/usb/serial/generic.c                |  10 +-
 include/linux/serial_core.h                 |  92 ++-------------
 include/linux/sysrq.h                       |   1 +
 kernel/sysctl.c                             |  41 ++++---
 lib/Kconfig.debug                           |   8 ++
 58 files changed, 238 insertions(+), 346 deletions(-)
Signature · 1 line
2.24.0