tty: source all tty Kconfig files in one place

'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>

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index b77f796a5ace209c6e33456ee6a4838279259901..5d30b19099aa2681db859fa084c54cb388135f04 100644 (file)
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -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

diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig
index a312cb33a99b7776a1ced0855c69e1d13f8ab1a8..ebd2549bba6db8878cd139eca87165f921fc4433 100644 (file)
--- a/drivers/tty/Kconfig
+++ b/drivers/tty/Kconfig
@@ -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"

diff --git a/drivers/tty/hvc/Kconfig b/drivers/tty/hvc/Kconfig
index 6a3c97d345a0121bb778d88889918cee0b573664..31b7e1b0374916744f3ec867c49d07b0d0dc00dd 100644 (file)
--- a/drivers/tty/hvc/Kconfig
+++ b/drivers/tty/hvc/Kconfig
@@ -1,5 +1,4 @@
 # 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

diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 52eaac21ff9f5490a6d070a19c7c696dac31bdf0..a19c9d7fff2e7cc54802592764996838a02e98d2 100644 (file)
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -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