tty: source all tty Kconfig files in one place (00e37543) · Commits · 戴 / test

'source' (include) all of the tty/*/Kconfig files from drivers/tty/Kconfig instead of from drivers/char/Kconfig. This consolidates them both in source code and in menu presentation to the user. Move hvc/Kconfig and serial/Kconfig 'source' lines into the if TTY/endif block and remove the if TTY/endif blocks from those 2 files. Cc: linux-serial@vger.kernel.org Cc: Jiri Slaby <jslaby@suse.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Arnd Bergmann <arnd@arndb.de> Suggested-by:

Jiri Slaby <jslaby@suse.com> Suggested-by:

Arnd Bergmann <arnd@arndb.de> Acked-by:

Arnd Bergmann <arnd@arndb.de> Signed-off-by:

Randy Dunlap <rdunlap@infradead.org> Link: https://lore.kernel.org/r/20200311225736.32147-3-rdunlap@infradead.org Signed-off-by:

Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/char/Kconfig

+0 −5

Original line number	Diff line number	Diff line
		@@ -7,9 +7,6 @@ menu "Character devices"

		source "drivers/tty/Kconfig"

		source "drivers/tty/serial/Kconfig"
		source "drivers/tty/serdev/Kconfig"

		config TTY_PRINTK
		tristate "TTY driver to output user messages via printk"
		depends on EXPERT && TTY
		@@ -94,8 +91,6 @@ config PPDEV

		If unsure, say N.

		source "drivers/tty/hvc/Kconfig"

		config VIRTIO_CONSOLE
		tristate "Virtio console"
		depends on VIRTIO && TTY

drivers/tty/Kconfig

+6 −0

Original line number	Diff line number	Diff line
		@@ -477,4 +477,10 @@ config LDISC_AUTOLOAD
		dev.tty.ldisc_autoload sysctl, this configuration option will
		only set the default value of this functionality.

		source "drivers/tty/hvc/Kconfig"

		source "drivers/tty/serial/Kconfig"

		endif # TTY

		source "drivers/tty/serdev/Kconfig"

drivers/tty/hvc/Kconfig

+0 −3

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		if TTY

		config HVC_DRIVER
		bool
		@@ -113,5 +112,3 @@ config HVCS
		will depend on arch specific APIs exported from hvcserver.ko
		which will also be compiled when this driver is built as a
		module.

		endif # TTY

drivers/tty/serial/Kconfig

+0 −4

Original line number	Diff line number	Diff line
		@@ -3,8 +3,6 @@
		# Serial device configuration
		#

		if TTY

		menu "Serial drivers"
		depends on HAS_IOMEM

		@@ -1576,5 +1574,3 @@ endmenu

		config SERIAL_MCTRL_GPIO
		tristate

		endif # TTY

Admin message