Skip to content

Commit

Permalink
USB: remove CONFIG_EXPERIMENTAL dependancies
Browse files Browse the repository at this point in the history
As discussed at the kernel summit this year, CONFIG_EXPERIMENTAL means
nothing, so let's get rid of it.

Acked-by: Felipe Balbi <balbi@ti.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: David Herrmann <dh.herrmann@googlemail.com>
Cc: Hauke Mehrtens <hauke@hauke-m.de>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Neil Zhang <zhangwm@marvell.com>
Cc: Randy Dunlap <rdunlap@xenotime.net>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Greg Kroah-Hartman committed Sep 18, 2012
1 parent c05fecb commit eb83be9
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 26 deletions.
2 changes: 1 addition & 1 deletion drivers/usb/core/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ config USB_SUSPEND

config USB_OTG
bool "OTG support"
depends on USB && EXPERIMENTAL
depends on USB
depends on USB_SUSPEND
default n
help
Expand Down
17 changes: 6 additions & 11 deletions drivers/usb/gadget/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ config USB_ZERO_HNPTEST
one serve as the USB host instead (in the "B-Host" role).

config USB_AUDIO
tristate "Audio Gadget (EXPERIMENTAL)"
tristate "Audio Gadget"
depends on SND
select USB_LIBCOMPOSITE
select SND_PCM
Expand Down Expand Up @@ -672,24 +672,19 @@ config USB_G_NCM
dynamically linked module called "g_ncm".

config USB_GADGETFS
tristate "Gadget Filesystem (EXPERIMENTAL)"
depends on EXPERIMENTAL
tristate "Gadget Filesystem"
help
This driver provides a filesystem based API that lets user mode
programs implement a single-configuration USB device, including
endpoint I/O and control requests that don't relate to enumeration.
All endpoints, transfer speeds, and transfer types supported by
the hardware are available, through read() and write() calls.

Currently, this option is still labelled as EXPERIMENTAL because
of existing race conditions in the underlying in-kernel AIO core.

Say "y" to link the driver statically, or "m" to build a
dynamically linked module called "gadgetfs".

config USB_FUNCTIONFS
tristate "Function Filesystem (EXPERIMENTAL)"
depends on EXPERIMENTAL
tristate "Function Filesystem"
select USB_LIBCOMPOSITE
select USB_FUNCTIONFS_GENERIC if !(USB_FUNCTIONFS_ETH || USB_FUNCTIONFS_RNDIS)
help
Expand Down Expand Up @@ -799,8 +794,8 @@ config USB_G_SERIAL
make MS-Windows work with CDC ACM.

config USB_MIDI_GADGET
tristate "MIDI Gadget (EXPERIMENTAL)"
depends on SND && EXPERIMENTAL
tristate "MIDI Gadget"
depends on SND
select USB_LIBCOMPOSITE
select SND_RAWMIDI
help
Expand Down Expand Up @@ -867,7 +862,7 @@ config USB_G_ACM_MS
dynamically linked module called "g_acm_ms".

config USB_G_MULTI
tristate "Multifunction Composite Gadget (EXPERIMENTAL)"
tristate "Multifunction Composite Gadget"
depends on BLOCK && NET
select USB_G_MULTI_CDC if !USB_G_MULTI_RNDIS
select USB_LIBCOMPOSITE
Expand Down
22 changes: 10 additions & 12 deletions drivers/usb/host/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ config USB_C67X00_HCD
module will be called c67x00.

config USB_XHCI_HCD
tristate "xHCI HCD (USB 3.0) support (EXPERIMENTAL)"
depends on USB && USB_ARCH_HAS_XHCI && EXPERIMENTAL
tristate "xHCI HCD (USB 3.0) support"
depends on USB && USB_ARCH_HAS_XHCI
---help---
The eXtensible Host Controller Interface (xHCI) is standard for USB 3.0
"SuperSpeed" host controller hardware.
Expand Down Expand Up @@ -262,7 +262,7 @@ config USB_ISP116X_HCD

config USB_ISP1760_HCD
tristate "ISP 1760 HCD support"
depends on USB && EXPERIMENTAL
depends on USB
---help---
The ISP1760 chip is a USB 2.0 host controller.

Expand Down Expand Up @@ -376,7 +376,7 @@ config USB_OHCI_HCD_PCI

config USB_OHCI_HCD_SSB
bool "OHCI support for Broadcom SSB OHCI core (DEPRECATED)"
depends on USB_OHCI_HCD && (SSB = y || SSB = USB_OHCI_HCD) && EXPERIMENTAL
depends on USB_OHCI_HCD && (SSB = y || SSB = USB_OHCI_HCD)
select USB_HCD_SSB
select USB_OHCI_HCD_PLATFORM
default n
Expand Down Expand Up @@ -414,7 +414,7 @@ config USB_CNS3XXX_OHCI

config USB_OHCI_HCD_PLATFORM
bool "Generic OHCI driver for a platform device"
depends on USB_OHCI_HCD && EXPERIMENTAL
depends on USB_OHCI_HCD
default n
---help---
Adds an OHCI host driver for a generic platform device, which
Expand All @@ -424,7 +424,7 @@ config USB_OHCI_HCD_PLATFORM

config USB_EHCI_HCD_PLATFORM
bool "Generic EHCI driver for a platform device"
depends on USB_EHCI_HCD && EXPERIMENTAL
depends on USB_EHCI_HCD
default n
---help---
Adds an EHCI host driver for a generic platform device, which
Expand Down Expand Up @@ -591,8 +591,7 @@ config USB_RENESAS_USBHS_HCD
module will be called renesas-usbhs.

config USB_WHCI_HCD
tristate "Wireless USB Host Controller Interface (WHCI) driver (EXPERIMENTAL)"
depends on EXPERIMENTAL
tristate "Wireless USB Host Controller Interface (WHCI) driver"
depends on PCI && USB && UWB
select USB_WUSB
select UWB_WHCI
Expand All @@ -604,8 +603,7 @@ config USB_WHCI_HCD
will be called "whci-hcd".

config USB_HWA_HCD
tristate "Host Wire Adapter (HWA) driver (EXPERIMENTAL)"
depends on EXPERIMENTAL
tristate "Host Wire Adapter (HWA) driver"
depends on USB && UWB
select USB_WUSB
select UWB_HWA
Expand Down Expand Up @@ -656,7 +654,7 @@ config USB_OCTEON2_COMMON

config USB_HCD_BCMA
tristate "BCMA usb host driver"
depends on BCMA && EXPERIMENTAL
depends on BCMA
select USB_OHCI_HCD_PLATFORM if USB_OHCI_HCD
select USB_EHCI_HCD_PLATFORM if USB_EHCI_HCD
help
Expand All @@ -668,7 +666,7 @@ config USB_HCD_BCMA

config USB_HCD_SSB
tristate "SSB usb host driver"
depends on SSB && EXPERIMENTAL
depends on SSB
select USB_OHCI_HCD_PLATFORM if USB_OHCI_HCD
select USB_EHCI_HCD_PLATFORM if USB_EHCI_HCD
help
Expand Down
3 changes: 1 addition & 2 deletions drivers/usb/wusbcore/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
# Wireless USB Core configuration
#
config USB_WUSB
tristate "Enable Wireless USB extensions (EXPERIMENTAL)"
depends on EXPERIMENTAL
tristate "Enable Wireless USB extensions"
depends on USB
depends on PCI
depends on UWB
Expand Down

0 comments on commit eb83be9

Please sign in to comment.