usb: Move definition of USB_EHCI_BIG_ENDIAN_MMIO et al. out side of the ifs.
authorDavid Daney <david.daney@cavium.com>
Sat, 10 Aug 2013 01:17:48 +0000 (18:17 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 12 Aug 2013 19:18:38 +0000 (12:18 -0700)
When CONFIG_USB_SUPPORT is not selected we get things like:

scripts/kconfig/mconf Kconfig
warning: (MIPS_SEAD3 && PMC_MSP && CPU_CAVIUM_OCTEON) selects USB_EHCI_BIG_ENDIAN_MMIO which has unmet direct dependencies (USB_SUPPORT && USB)

It is much cleaner to make the various system Kconfigs select
USB_EHCI_BIG_ENDIAN_MMIO rather than move the system config
information into USB's Kconfig, but the warnings are annoying.

Eliminate the warning by moving the definition of
USB_EHCI_BIG_ENDIAN_MMIO outside of all the Kconfig if statements.
While we are at it move USB_OHCI_BIG_ENDIAN_DESC,
USB_OHCI_BIG_ENDIAN_MMIO, USB_OHCI_LITTLE_ENDIAN and
USB_EHCI_BIG_ENDIAN_DESC too, as they could very well suffer similar
problems for other systems.

Get rid of the redundant "default n" in USB_OHCI_BIG_ENDIAN_DESC and
USB_OHCI_BIG_ENDIAN_MMIO

Signed-off-by: David Daney <david.daney@cavium.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/Kconfig
drivers/usb/host/Kconfig

index 73f62ca..2642b8a 100644 (file)
@@ -6,9 +6,26 @@
 config USB_ARCH_HAS_OHCI
        bool
 
+config USB_OHCI_BIG_ENDIAN_DESC
+       bool
+
+config USB_OHCI_BIG_ENDIAN_MMIO
+       bool
+
+config USB_OHCI_LITTLE_ENDIAN
+       bool
+       default n if STB03xxx || PPC_MPC52xx
+       default y
+
 config USB_ARCH_HAS_EHCI
        bool
 
+config USB_EHCI_BIG_ENDIAN_MMIO
+       bool
+
+config USB_EHCI_BIG_ENDIAN_DESC
+       bool
+
 config USB_ARCH_HAS_XHCI
        bool
 
index cf521d6..0947aac 100644 (file)
@@ -113,12 +113,6 @@ config USB_EHCI_HCD_PMC_MSP
                Enables support for the onchip USB controller on the PMC_MSP7100 Family SoC's.
                If unsure, say N.
 
-config USB_EHCI_BIG_ENDIAN_MMIO
-       bool
-
-config USB_EHCI_BIG_ENDIAN_DESC
-       bool
-
 config XPS_USB_HCD_XILINX
        bool "Use Xilinx usb host EHCI controller core"
        depends on (PPC32 || MICROBLAZE)
@@ -509,20 +503,6 @@ config USB_OCTEON_OHCI
          controller.  It is needed for low-speed USB 1.0 device
          support.  All CN6XXX based chips with USB are supported.
 
-
-config USB_OHCI_BIG_ENDIAN_DESC
-       bool
-       default n
-
-config USB_OHCI_BIG_ENDIAN_MMIO
-       bool
-       default n
-
-config USB_OHCI_LITTLE_ENDIAN
-       bool
-       default n if STB03xxx || PPC_MPC52xx
-       default y
-
 endif # USB_OHCI_HCD
 
 config USB_UHCI_HCD