make generic INIT_C_CC a bit more generic

turn it into an array initializer; then alpha, mips and powerpc
variants fold into it.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Link: https://lore.kernel.org/r/YxDm7M6M91gC2RPL@ZenIV
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/alpha/include/asm/termios.h b/arch/alpha/include/asm/termios.h
index 9cc784d0a83c9db9ed501432848eb13d61c52764..3894fd92c5080017bcdf9434b43375744d1354c7 100644 (file)
--- a/arch/alpha/include/asm/termios.h
+++ b/arch/alpha/include/asm/termios.h
@@ -5,12 +5,4 @@
 #include <linux/uaccess.h>
 #include <uapi/asm/termios.h>
 
-/*     eof=^D          eol=\0          eol2=\0         erase=del
-       werase=^W       kill=^U         reprint=^R      sxtc=\0
-       intr=^C         quit=^\         susp=^Z         <OSF/1 VDSUSP>
-       start=^Q        stop=^S         lnext=^V        discard=^O
-       vmin=\1         vtime=\0
-*/
-#define INIT_C_CC "\004\000\000\177\027\025\022\000\003\034\032\000\021\023\026\017\001\000"
-
 #endif /* _ALPHA_TERMIOS_H */

diff --git a/arch/mips/include/asm/termios.h b/arch/mips/include/asm/termios.h
index 059c800afaa18b5488276fcbe6b1570c08b425d9..12bc56857bf1498fff0fd70224b4c038ed3bd9e4 100644 (file)
--- a/arch/mips/include/asm/termios.h
+++ b/arch/mips/include/asm/termios.h
@@ -12,13 +12,4 @@
 #include <linux/uaccess.h>
 #include <uapi/asm/termios.h>
 
-/*
- *     intr=^C         quit=^\         erase=del       kill=^U
- *     vmin=\1         vtime=\0        eol2=\0         swtc=\0
- *     start=^Q        stop=^S         susp=^Z         vdsusp=
- *     reprint=^R      discard=^O      werase=^W       lnext=^V
- *     eof=^D          eol=\0
- */
-#define INIT_C_CC "\003\034\177\025\1\0\0\0\021\023\032\0\022\017\027\026\004\0"
-
 #endif /* _ASM_TERMIOS_H */

diff --git a/arch/powerpc/include/asm/termios.h b/arch/powerpc/include/asm/termios.h
index e18a05a6ed349c4c77ed335f270cf2dda470eb1e..83794533f607defb9402072b8374a1d6c17cb7e9 100644 (file)
--- a/arch/powerpc/include/asm/termios.h
+++ b/arch/powerpc/include/asm/termios.h
@@ -10,7 +10,4 @@
 
 #include <uapi/asm/termios.h>
 
-/*                   ^C  ^\ del  ^U  ^D   1   0   0   0   0  ^W  ^R  ^Z  ^Q  ^S  ^V  ^O  */
-#define INIT_C_CC "\003\034\177\025\004\001\000\000\000\000\027\022\032\021\023\026\017"
-
 #endif /* _ASM_POWERPC_TERMIOS_H */

diff --git a/include/linux/termios_internal.h b/include/linux/termios_internal.h
index 7eb3598c109d3a95f9063c3aa2a2043e3e17c46a..8a53141ab44a22064386c7a0744a994224b664f6 100644 (file)
--- a/include/linux/termios_internal.h
+++ b/include/linux/termios_internal.h
@@ -12,7 +12,20 @@
        reprint=^R      discard=^O      werase=^W       lnext=^V
        eol2=\0
 */
-#define INIT_C_CC "\003\034\177\025\004\0\1\0\021\023\032\0\022\017\027\026\0"
+#define INIT_C_CC {            \
+       [VINTR] = 'C'-0x40,     \
+       [VQUIT] = '\\'-0x40,    \
+       [VERASE] = '\177',      \
+       [VKILL] = 'U'-0x40,     \
+       [VEOF] = 'D'-0x40,      \
+       [VSTART] = 'Q'-0x40,    \
+       [VSTOP] = 'S'-0x40,     \
+       [VSUSP] = 'Z'-0x40,     \
+       [VREPRINT] = 'R'-0x40,  \
+       [VDISCARD] = 'O'-0x40,  \
+       [VWERASE] = 'W'-0x40,   \
+       [VLNEXT] = 'V'-0x40,    \
+       [VMIN] = 1 }
 #endif
 
 int user_termio_to_kernel_termios(struct ktermios *, struct termio __user *);