usb: gadget: reword configuration choices

As USB_CONFIGFS is not a part of the "USB Gadget Drivers" choice
anymore, the name for the option and its attached description needs to
be more descriptive. It appears one level higher in the configuration
menu, and without the context provided by the comments for the choice
entry, it needs to make sense on its own.

Conversely, the "USB Gadget Drivers" entry now only introduces the
legacy drivers, where one or more functions are combined in a single
driver. As the configfs option can be used as a full-fledged
alternative, rename the choice entry to show that it is not the only
way to provice service as an USB gadget.

Signed-off-by: Romain Izard <romain.izard.pro@gmail.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>

diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index f3ee80ece68284551caab11e57ab664a61d0d784..c164d6b788c31f9922836f407c21e50bfce73f5a 100644 (file)
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -212,7 +212,7 @@ config USB_F_TCM
 # this first set of drivers all depend on bulk-capable hardware.
 
 config USB_CONFIGFS
-       tristate "USB functions configurable through configfs"
+       tristate "USB Gadget functions configurable through configfs"
        select USB_LIBCOMPOSITE
        help
          A Linux USB "gadget" can be set up through configfs.
@@ -458,7 +458,7 @@ config USB_CONFIGFS_F_TCM
          UAS utilizes the USB 3.0 feature called streams support.
 
 choice
-       tristate "USB Gadget Drivers"
+       tristate "USB Gadget precomposed configurations"
        default USB_ETH
        optional
        help
@@ -477,6 +477,12 @@ choice
          not be able work with that controller, or might need to implement
          a less common variant of a device class protocol.
 
+         The available choices each represent a single precomposed USB
+         gadget configuration. In the device model, each option contains
+         both the device instantiation as a child for a USB gadget
+         controller, and the relevant drivers for each function declared
+         by the device.
+
 source "drivers/usb/gadget/legacy/Kconfig"
 
 endchoice