| Message ID | 20240108134102.601-1-lukas.bulwahn@gmail.com |
|---|---|
| State | Accepted |
| Commit | 5c49b6a4a4bcf368f85cfe7a0e5ac3a7016f30fd |
| Headers | show |
| Series | vt: remove superfluous CONFIG_HW_CONSOLE | expand |
On Mon, Jan 08, 2024 at 02:41:02PM +0100, Lukas Bulwahn wrote: > The config HW_CONSOLE is always identical to the config VT and is not > visible in the kernel's build menuconfig. So, CONFIG_HW_CONSOLE is > redundant. > > Replace all references to CONFIG_HW_CONSOLE with CONFIG_VT and remove > CONFIG_HW_CONSOLE. > > Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com> > --- > I think this patch is best picked up by Greg rather than splitting it > in smaller pieces for m68k, amiga keyboard, fbdev etc. > > Greg, if that is fine, could you pick this for the next merge window? Yes, the "next" one, it's too late for 6.8-rc1, sorry. I'll look at it after -rc1 is out. thanks, greg k-h
Lukas Bulwahn <lukas.bulwahn@gmail.com> writes: Hello Lukas, > The config HW_CONSOLE is always identical to the config VT and is not > visible in the kernel's build menuconfig. So, CONFIG_HW_CONSOLE is > redundant. > > Replace all references to CONFIG_HW_CONSOLE with CONFIG_VT and remove > CONFIG_HW_CONSOLE. > > Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com> > --- Makes sense to me. Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
On Mon, Jan 08, 2024 at 02:41:02PM +0100, Lukas Bulwahn wrote: > The config HW_CONSOLE is always identical to the config VT and is not > visible in the kernel's build menuconfig. So, CONFIG_HW_CONSOLE is > redundant. > > Replace all references to CONFIG_HW_CONSOLE with CONFIG_VT and remove > CONFIG_HW_CONSOLE. > > Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com> > --- > I think this patch is best picked up by Greg rather than splitting it > in smaller pieces for m68k, amiga keyboard, fbdev etc. > > Greg, if that is fine, could you pick this for the next merge window? > > I was also considering to rename config VT_HW_CONSOLE_BINDING to > VT_CONSOLE_BINDING, as the dependency is on VT, not HW_CONSOLE, but > at the moment, that seemed more churn than value of clarification. > > arch/m68k/amiga/config.c | 2 +- > drivers/input/keyboard/amikbd.c | 6 +++--- Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Thanks.
diff --git a/arch/m68k/amiga/config.c b/arch/m68k/amiga/config.c index 7791673e547b..99718f3dc686 100644 --- a/arch/m68k/amiga/config.c +++ b/arch/m68k/amiga/config.c @@ -846,6 +846,6 @@ static void amiga_get_hardware_list(struct seq_file *m) * The Amiga keyboard driver needs key_maps, but we cannot export it in * drivers/char/defkeymap.c, as it is autogenerated */ -#ifdef CONFIG_HW_CONSOLE +#ifdef CONFIG_VT EXPORT_SYMBOL_GPL(key_maps); #endif diff --git a/drivers/input/keyboard/amikbd.c b/drivers/input/keyboard/amikbd.c index e305c44cd0aa..ecfae0b0b6aa 100644 --- a/drivers/input/keyboard/amikbd.c +++ b/drivers/input/keyboard/amikbd.c @@ -26,7 +26,7 @@ MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>"); MODULE_DESCRIPTION("Amiga keyboard driver"); MODULE_LICENSE("GPL"); -#ifdef CONFIG_HW_CONSOLE +#ifdef CONFIG_VT static unsigned char amikbd_keycode[0x78] __initdata = { [0] = KEY_GRAVE, [1] = KEY_1, @@ -148,9 +148,9 @@ static void __init amikbd_init_console_keymaps(void) memcpy(key_maps[i], temp_map, sizeof(temp_map)); } } -#else /* !CONFIG_HW_CONSOLE */ +#else /* !CONFIG_VT */ static inline void amikbd_init_console_keymaps(void) {} -#endif /* !CONFIG_HW_CONSOLE */ +#endif /* !CONFIG_VT */ static const char *amikbd_messages[8] = { [0] = KERN_ALERT "amikbd: Ctrl-Amiga-Amiga reset warning!!\n", diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig index 5646dc6242cd..a45d423ad10f 100644 --- a/drivers/tty/Kconfig +++ b/drivers/tty/Kconfig @@ -75,14 +75,9 @@ config VT_CONSOLE_SLEEP def_bool y depends on VT_CONSOLE && PM_SLEEP -config HW_CONSOLE - bool - depends on VT - default y - config VT_HW_CONSOLE_BINDING bool "Support for binding and unbinding console drivers" - depends on HW_CONSOLE + depends on VT help The virtual terminal is the device that interacts with the physical terminal through console drivers. On these systems, at least one diff --git a/drivers/tty/vt/Makefile b/drivers/tty/vt/Makefile index b3dfe9d5717e..2c8ce8b592ed 100644 --- a/drivers/tty/vt/Makefile +++ b/drivers/tty/vt/Makefile @@ -5,9 +5,9 @@ FONTMAPFILE = cp437.uni obj-$(CONFIG_VT) += vt_ioctl.o vc_screen.o \ - selection.o keyboard.o + selection.o keyboard.o \ + vt.o defkeymap.o obj-$(CONFIG_CONSOLE_TRANSLATIONS) += consolemap.o consolemap_deftbl.o -obj-$(CONFIG_HW_CONSOLE) += vt.o defkeymap.o # Files generated that shall be removed upon make clean clean-files := consolemap_deftbl.c defkeymap.c diff --git a/drivers/video/fbdev/tgafb.c b/drivers/video/fbdev/tgafb.c index ca43774f3156..dccfc38cfbd5 100644 --- a/drivers/video/fbdev/tgafb.c +++ b/drivers/video/fbdev/tgafb.c @@ -380,7 +380,7 @@ tgafb_set_par(struct fb_info *info) BT463_LOAD_ADDR(par, 0x0000); TGA_WRITE_REG(par, BT463_PALETTE << 2, TGA_RAMDAC_SETUP_REG); -#ifdef CONFIG_HW_CONSOLE +#ifdef CONFIG_VT for (i = 0; i < 16; i++) { int j = color_table[i]; diff --git a/include/linux/console.h b/include/linux/console.h index 779d388af8a0..c129e4173dec 100644 --- a/include/linux/console.h +++ b/include/linux/console.h @@ -112,7 +112,7 @@ int con_is_bound(const struct consw *csw); int do_unregister_con_driver(const struct consw *csw); int do_take_over_console(const struct consw *sw, int first, int last, int deflt); void give_up_console(const struct consw *sw); -#ifdef CONFIG_HW_CONSOLE +#ifdef CONFIG_VT int con_debug_enter(struct vc_data *vc); int con_debug_leave(void); #else diff --git a/lib/Kconfig.kgdb b/lib/Kconfig.kgdb index 3b9a44008433..b5c0e6576749 100644 --- a/lib/Kconfig.kgdb +++ b/lib/Kconfig.kgdb @@ -43,7 +43,7 @@ config KGDB_SERIAL_CONSOLE tristate "KGDB: use kgdb over the serial console" select CONSOLE_POLL select MAGIC_SYSRQ - depends on TTY && HW_CONSOLE + depends on TTY && VT default y help Share a serial console with kgdb. Sysrq-g must be used
The config HW_CONSOLE is always identical to the config VT and is not visible in the kernel's build menuconfig. So, CONFIG_HW_CONSOLE is redundant. Replace all references to CONFIG_HW_CONSOLE with CONFIG_VT and remove CONFIG_HW_CONSOLE. Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com> --- I think this patch is best picked up by Greg rather than splitting it in smaller pieces for m68k, amiga keyboard, fbdev etc. Greg, if that is fine, could you pick this for the next merge window? I was also considering to rename config VT_HW_CONSOLE_BINDING to VT_CONSOLE_BINDING, as the dependency is on VT, not HW_CONSOLE, but at the moment, that seemed more churn than value of clarification. arch/m68k/amiga/config.c | 2 +- drivers/input/keyboard/amikbd.c | 6 +++--- drivers/tty/Kconfig | 7 +------ drivers/tty/vt/Makefile | 4 ++-- drivers/video/fbdev/tgafb.c | 2 +- include/linux/console.h | 2 +- lib/Kconfig.kgdb | 2 +- 7 files changed, 10 insertions(+), 15 deletions(-)