Latest config warning

Commit Message

Felipe Balbi Jan. 7, 2011, 7:22 p.m. UTC

None

Patch

diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 5a7c8f1..558cf4d 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -10,8 +10,6 @@  menuconfig USB_SUPPORT
          This option adds core support for Universal Serial Bus (USB).
          You will also need drivers from the following menu to make use of it.
 
-if USB_SUPPORT
-
 # Host-side USB depends on having a host controller
 # NOTE:  dummy_hcd is always an option, but it's ignored here ...
 # NOTE:  SL-811 option should be board-specific ...
@@ -70,6 +68,8 @@  config USB_ARCH_HAS_EHCI
        default y if ARCH_CNS3XXX
        default PCI
 
+if USB_SUPPORT
+
 # ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface.
 config USB
        tristate "Support for Host-side USB"

The idea is that ARCHs can select USB_ARCH_HAS_* without having to
enable USB_SUPPORT. Currently, there's a big mess of conditional default
values on all USB_ARCH_HAS_* entries:

config USB_ARCH_HAS_EHCI
	boolean
	default y if PPC_83xx
	default y if PPC_MPC512x
	default y if SOC_AU1200
	default y if ARCH_IXP4XX
	default y if ARCH_W90X900
	default y if ARCH_AT91SAM9G45
	default y if ARCH_MXC
	default y if ARCH_OMAP3
	default y if ARCH_CNS3XXX
	default PCI

IMHO it's much better to have something like:

diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 5a7c8f1..ac137d1 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -10,8 +10,6 @@  menuconfig USB_SUPPORT
          This option adds core support for Universal Serial Bus (USB).
          You will also need drivers from the following menu to make use of it.
 
-if USB_SUPPORT
-
 # Host-side USB depends on having a host controller
 # NOTE:  dummy_hcd is always an option, but it's ignored here ...
 # NOTE:  SL-811 option should be board-specific ...
@@ -59,16 +57,9 @@  config USB_ARCH_HAS_OHCI
 # some non-PCI hcds implement EHCI
 config USB_ARCH_HAS_EHCI
        boolean
-       default y if PPC_83xx
-       default y if PPC_MPC512x
-       default y if SOC_AU1200
-       default y if ARCH_IXP4XX
-       default y if ARCH_W90X900
-       default y if ARCH_AT91SAM9G45
-       default y if ARCH_MXC
-       default y if ARCH_OMAP3
-       default y if ARCH_CNS3XXX
-       default PCI
+       default n
+
+if USB_SUPPORT
 
 # ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface.
 config USB