Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f09c2b48 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Andrey Konovalov
Browse files

UPSTREAM: usb: gadget: move choice ... endchoice to legacy/Kconfig 



(Upstream commit 10e5e6c2496354f0afec82dba459339c421badbf.)

drivers/usb/gadget/Kconfig includes drivers/usb/gadget/legacy/Kconfig
inside the 'choice' block. The current Kconfig allows this, but I'd
like to discourage this usage.

People tend to mess up the structure without noticing that entire
drivers/usb/gadget/legacy/Kconfig is placed in the choice context.
In fact, legacy/Kconfig mixes up bool and tristate in the choice,
and creates nested choice, etc.

This commit does not change the behavior, but it will help people
notice how badly this Kconfig file is written.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Link: https://lore.kernel.org/r/20191211073857.16780-1-masahiroy@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Bug: 147413187
Signed-off-by: default avatarAndrey Konovalov <andreyknvl@google.com>
Change-Id: Ib2b96fd9c2acb681b2186eb89ec1f0f2b18d0e89
parent 196eb52d

drivers/usb/gadget/Kconfig

+0 −28
Original line number Diff line number Diff line
@@ -513,34 +513,6 @@ config USB_CONFIGFS_F_TCM 
	  Both protocols can work on USB2.0 and USB3.0.

	  UAS utilizes the USB 3.0 feature called streams support.



choice

	tristate "USB Gadget precomposed configurations"

	default USB_ETH

	optional

	help

	  A Linux "Gadget Driver" talks to the USB Peripheral Controller

	  driver through the abstract "gadget" API.  Some other operating

	  systems call these "client" drivers, of which "class drivers"

	  are a subset (implementing a USB device class specification).

	  A gadget driver implements one or more USB functions using

	  the peripheral hardware.



	  Gadget drivers are hardware-neutral, or "platform independent",

	  except that they sometimes must understand quirks or limitations

	  of the particular controllers they work with.  For example, when

	  a controller doesn't support alternate configurations or provide

	  enough of the right types of endpoints, the gadget driver might

	  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



endif # USB_GADGET

drivers/usb/gadget/legacy/Kconfig

+28 −0
Original line number Diff line number Diff line
@@ -13,6 +13,32 @@ 
# both kinds of controller can also support "USB On-the-Go" (CONFIG_USB_OTG).

#



choice

	tristate "USB Gadget precomposed configurations"

	default USB_ETH

	optional

	help

	  A Linux "Gadget Driver" talks to the USB Peripheral Controller

	  driver through the abstract "gadget" API.  Some other operating

	  systems call these "client" drivers, of which "class drivers"

	  are a subset (implementing a USB device class specification).

	  A gadget driver implements one or more USB functions using

	  the peripheral hardware.



	  Gadget drivers are hardware-neutral, or "platform independent",

	  except that they sometimes must understand quirks or limitations

	  of the particular controllers they work with.  For example, when

	  a controller doesn't support alternate configurations or provide

	  enough of the right types of endpoints, the gadget driver might

	  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.



config USB_ZERO

	tristate "Gadget Zero (DEVELOPMENT)"

	select USB_LIBCOMPOSITE
@@ -490,3 +516,5 @@ config USB_G_WEBCAM 


	  Say "y" to link the driver statically, or "m" to build a

	  dynamically linked module called "g_webcam".



endchoice