From: Randy Dunlap <rdunlap@infradead.org>
To: linux-kernel@vger.kernel.org
Cc: Randy Dunlap <rdunlap@infradead.org>,
Arnd Bergmann <arnd@arndb.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jiri Slaby <jslaby@suse.com>,
linux-serial@vger.kernel.org
Subject: [PATCH 2/3 v2] tty: source all tty Kconfig files in one place
Date: Wed, 11 Mar 2020 15:57:35 -0700 [thread overview]
Message-ID: <20200311225736.32147-3-rdunlap@infradead.org> (raw)
In-Reply-To: <20200311225736.32147-1-rdunlap@infradead.org>
'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.
Suggested-by: Arnd Bergmann <arnd@arndb.de>
Suggested-by: Jiri Slaby <jslaby@suse.com>
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Slaby <jslaby@suse.com>
Cc: linux-serial@vger.kernel.org
---
v2: move hvc/Kconfig & serial/Kconfig lines and drop their if/endif blocks
drivers/char/Kconfig | 5 -----
drivers/tty/Kconfig | 6 ++++++
drivers/tty/hvc/Kconfig | 3 ---
drivers/tty/serial/Kconfig | 4 ----
4 files changed, 6 insertions(+), 12 deletions(-)
--- linux-next-20200311.orig/drivers/char/Kconfig
+++ linux-next-20200311/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
--- linux-next-20200311.orig/drivers/tty/Kconfig
+++ linux-next-20200311/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"
--- linux-next-20200311.orig/drivers/tty/hvc/Kconfig
+++ linux-next-20200311/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
--- linux-next-20200311.orig/drivers/tty/serial/Kconfig
+++ linux-next-20200311/drivers/tty/serial/Kconfig
@@ -3,8 +3,6 @@
# Serial device configuration
#
-if TTY
-
menu "Serial drivers"
depends on HAS_IOMEM
@@ -1566,5 +1564,3 @@ endmenu
config SERIAL_MCTRL_GPIO
tristate
-
-endif # TTY
next prev parent reply other threads:[~2020-03-11 22:57 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-11 22:57 [PATCH 0/3 v2] char/tty: clean up menus Randy Dunlap
2020-03-11 22:57 ` [PATCH 1/3 v2] char: group dev configs togther Randy Dunlap
2020-03-12 8:18 ` Arnd Bergmann
2020-03-11 22:57 ` Randy Dunlap [this message]
2020-03-12 8:18 ` [PATCH 2/3 v2] tty: source all tty Kconfig files in one place Arnd Bergmann
2020-03-11 22:57 ` [PATCH 3/3 v2] tty: reorganize tty & serial menus Randy Dunlap
2020-03-12 8:21 ` Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200311225736.32147-3-rdunlap@infradead.org \
--to=rdunlap@infradead.org \
--cc=arnd@arndb.de \
--cc=gregkh@linuxfoundation.org \
--cc=jslaby@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).