This patch removes the depends on USB from all config symbols in
drivers/usb/host/Kconfig and replace that with an if USB / endif block
as suggested by Alan Stern. Some source ... Kconfig lines have been
shuffled around to permit a better regroupment of the Kconfig files
depending on config USB item. No functionnal change is introduced.
Acked-by: Alan Stern st...@rowland.harvard.edu
Signed-off-by: Florian Fainelli flor...@openwrt.org
---
Changes since v3:
- added Alan's Acked-by tag
- refreshed against usb-next
Changes since v2:
- properly keep USB_MUSB_HDRC dependency
Changes since v1:
- add missing if USB in drivers/usb/Kconfig before USB_USS720
Changes since RFC:
- only remove the depends on USB conditionnals and not more as
the RFC patch did
drivers/usb/Kconfig| 23 +++
drivers/usb/atm/Kconfig|2 +-
drivers/usb/class/Kconfig |6 +-
drivers/usb/core/Kconfig |6 --
drivers/usb/host/Kconfig | 30 +++---
drivers/usb/image/Kconfig |4 +---
drivers/usb/misc/Kconfig | 21 -
drivers/usb/misc/sisusbvga/Kconfig |2 +-
drivers/usb/mon/Kconfig|1 -
drivers/usb/musb/Kconfig |2 +-
drivers/usb/renesas_usbhs/Kconfig |2 +-
drivers/usb/serial/Kconfig |2 +-
drivers/usb/storage/Kconfig|7 +++
drivers/usb/wusbcore/Kconfig |2 --
14 files changed, 36 insertions(+), 74 deletions(-)
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 2c481b8..92e1dc9 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -122,9 +122,9 @@ config USB
To compile this driver as a module, choose M here: the
module will be called usbcore.
-source drivers/usb/core/Kconfig
+if USB
-source drivers/usb/dwc3/Kconfig
+source drivers/usb/core/Kconfig
source drivers/usb/mon/Kconfig
@@ -134,8 +134,6 @@ source drivers/usb/host/Kconfig
source drivers/usb/musb/Kconfig
-source drivers/usb/chipidea/Kconfig
-
source drivers/usb/renesas_usbhs/Kconfig
source drivers/usb/class/Kconfig
@@ -144,12 +142,19 @@ source drivers/usb/storage/Kconfig
source drivers/usb/image/Kconfig
+endif
+
+source drivers/usb/dwc3/Kconfig
+
+source drivers/usb/chipidea/Kconfig
+
comment USB port drivers
- depends on USB
+
+if USB
config USB_USS720
tristate USS720 parport driver
- depends on USB PARPORT
+ depends on PARPORT
select PARPORT_NOT_PC
---help---
This driver is for USB parallel port adapters that use the Lucent
@@ -180,10 +185,12 @@ source drivers/usb/serial/Kconfig
source drivers/usb/misc/Kconfig
-source drivers/usb/phy/Kconfig
-
source drivers/usb/atm/Kconfig
+endif # USB
+
+source drivers/usb/phy/Kconfig
+
source drivers/usb/gadget/Kconfig
endif # USB_SUPPORT
diff --git a/drivers/usb/atm/Kconfig b/drivers/usb/atm/Kconfig
index be0b8da..0f92294 100644
--- a/drivers/usb/atm/Kconfig
+++ b/drivers/usb/atm/Kconfig
@@ -4,7 +4,7 @@
menuconfig USB_ATM
tristate USB DSL modem support
- depends on USB ATM
+ depends on ATM
select CRC32
default n
help
diff --git a/drivers/usb/class/Kconfig b/drivers/usb/class/Kconfig
index 316aac8..bb8b736 100644
--- a/drivers/usb/class/Kconfig
+++ b/drivers/usb/class/Kconfig
@@ -2,11 +2,10 @@
# USB Class driver configuration
#
comment USB Device Class drivers
- depends on USB
config USB_ACM
tristate USB Modem (CDC ACM) support
- depends on USB TTY
+ depends on TTY
---help---
This driver supports USB modems and ISDN adapters which support the
Communication Device Class Abstract Control Model interface.
@@ -21,7 +20,6 @@ config USB_ACM
config USB_PRINTER
tristate USB Printer support
- depends on USB
help
Say Y here if you want to connect a USB printer to your computer's
USB port.
@@ -31,7 +29,6 @@ config USB_PRINTER
config USB_WDM
tristate USB Wireless Device Management support
- depends on USB
---help---
This driver supports the WMC Device Management functionality
of cell phones compliant to the CDC WMC specification. You can use
@@ -42,7 +39,6 @@ config USB_WDM
config USB_TMC
tristate USB Test and Measurement Class support
- depends on USB
help
Say Y here if you want to connect a USB device that follows
the USB.org specification for USB Test and Measurement devices
diff --git a/drivers/usb/core/Kconfig b/drivers/usb/core/Kconfig
index 7b7305e..8772b36 100644
--- a/drivers/usb/core/Kconfig
+++ b/drivers/usb/core/Kconfig
@@ -3,7 +3,6 @@
#
config USB_DEBUG
bool USB verbose debug messages
- depends on USB
help
Say Y here if you want the USB core hub drivers to produce a bunch
of debug messages to
