[PATCH] firewire: dissolve one menu indirection

[Jan Engelhardt]

Assume you are in the "Device Drivers" menu in menuconfig, and the
cursor is on "IEEE 1394 (FireWire) support". To deactivate everything
FireWire-related, the following keystrokes are needed:

ENTER N DOWN N RIGHT ENTER

The plan of v6.5-1-gfd416616d099 was to reduce this to just

N

by making "IEEE 1394" a menuconfig item. That did not resonate, so
try a middle way which reduces it to

N DOWN N

without introducing a new config option, by dissolving one level of
menus.

Signed-off-by: Jan Engelhardt <jengelh@xxxxxxx>
---
This patch applies on top of fd416616d0995f4947dd0a7a8c2ac4d9f916a9d0.

 drivers/firewire/Kconfig | 32 +++++++++++---------------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/drivers/firewire/Kconfig b/drivers/firewire/Kconfig
index be1a9e685782..6b27944059bc 100644
--- a/drivers/firewire/Kconfig
+++ b/drivers/firewire/Kconfig
@@ -1,22 +1,10 @@
 # SPDX-License-Identifier: GPL-2.0-only
-menuconfig FIREWIRE_SUPPORT
-	bool "IEEE 1394 (FireWire) support"
-	default y
+menuconfig FIREWIRE
+	tristate "FireWire driver stack"
+	select CRC_ITU_T
 	depends on PCI || COMPILE_TEST
 	# firewire-core does not depend on PCI but is
 	# not useful without PCI controller driver
-	help
-	  Support for FireWire.
-
-	  The answer to this question will not directly affect the
-	  kernel: saying N will just cause the configurator to skip all
-	  the questions about FireWire.
-
-if FIREWIRE_SUPPORT
-
-config FIREWIRE
-	tristate "FireWire driver stack"
-	select CRC_ITU_T
 	help
 	  This is the new-generation IEEE 1394 (FireWire) driver stack
 	  a.k.a. Juju, a new implementation designed for robustness and
@@ -28,9 +16,11 @@ config FIREWIRE
 	  To compile this driver as a module, say M here: the module will be
 	  called firewire-core.
 
+if FIREWIRE
+
 config FIREWIRE_KUNIT_UAPI_TEST
 	tristate "KUnit tests for layout of structure in UAPI" if !KUNIT_ALL_TESTS
-	depends on FIREWIRE && KUNIT
+	depends on KUNIT
 	default KUNIT_ALL_TESTS
 	help
 	  This builds the KUnit tests whether structures exposed to user
@@ -46,7 +36,7 @@ config FIREWIRE_KUNIT_UAPI_TEST
 
 config FIREWIRE_OHCI
 	tristate "OHCI-1394 controllers"
-	depends on PCI && FIREWIRE && MMU
+	depends on PCI && MMU
 	help
 	  Enable this driver if you have a FireWire controller based
 	  on the OHCI specification.  For all practical purposes, this
@@ -57,7 +47,7 @@ config FIREWIRE_OHCI
 
 config FIREWIRE_SBP2
 	tristate "Storage devices (SBP-2 protocol)"
-	depends on FIREWIRE && SCSI
+	depends on SCSI
 	help
 	  This option enables you to use SBP-2 devices connected to a
 	  FireWire bus.  SBP-2 devices include storage devices like
@@ -72,7 +62,7 @@ config FIREWIRE_SBP2
 
 config FIREWIRE_NET
 	tristate "IP networking over 1394"
-	depends on FIREWIRE && INET
+	depends on INET
 	help
 	  This enables IPv4/IPv6 over IEEE 1394, providing IP connectivity
 	  with other implementations of RFC 2734/3146 as found on several
@@ -81,6 +71,8 @@ config FIREWIRE_NET
 	  To compile this driver as a module, say M here:  The module will be
 	  called firewire-net.
 
+endif # FIREWIRE
+
 config FIREWIRE_NOSY
 	tristate "Nosy - a FireWire traffic sniffer for PCILynx cards"
 	depends on PCI
@@ -105,5 +97,3 @@ config FIREWIRE_NOSY
 	  nosy-dump, can be found in tools/firewire/ of the kernel sources.
 
 	  If unsure, say N.
-
-endif # FIREWIRE_SUPPORT
-- 
2.42.0