Revert "usb: gadget: allow to enable legacy drivers without USB_ETH"

Revert "usb: gadget: allow to enable legacy drivers without USB_ETH"

[Felipe Balbi]

Hi again,

Felipe Balbi <felipe.balbi@linux.intel.com> writes:
> Bart Van Assche <bart.vanassche@wdc.com> writes:
>> Romain Izard reported the following about commit 7a9618a22aad:
>>
>>     As it reached Linus' tree with v4.15-rc3, I recently noticed the
>>     following commit that triggered a Kconfig request. I believe that this
>>     change does not make sense.
>>
>>     7a9618a22aa usb: gadget: allow to enable legacy drivers without USB_ETH
>>
>>     USB_ETH was not a dependency, but a default value for the choice. As the
>>     choice was marked as "optional", it was possible to remove this value
>>     when building.
>>
>>     After this modification, the Kconfig choice option does not contain
>>     anything anymore, so it is useless.  It is also possible to select
>>     multiple built-in legacy drivers. This builds, but will not work as
>>     expected as only one legacy driver can be bound to an USB device
>>     controller at a time.
>>
>> Hence revert commit 7a9618a22aad.
>>
>> Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
>> Cc: Romain Izard <romain.izard.pro@gmail.com>
>> Cc: Arnd Bergmann <arnd@arndb.de>
>> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
>> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
>> Cc: Hannes Reinecke <hare@suse.com>
>> Cc: Nicholas Bellinger <nab@linux-iscsi.org>
>> Cc: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
>> Cc: linux-usb@vger.kernel.org
>> Cc: Felipe Balbi <felipe.balbi@linux.intel.com>
>
> this doesn't apply at all. Patch is not properly formatted.

I'll revert the commit manually just to get this fixed upstream.

Revert "usb: gadget: allow to enable legacy drivers without USB_ETH"

[Felipe Balbi]

Hi,

Bart Van Assche <bart.vanassche@wdc.com> writes:
> Romain Izard reported the following about commit 7a9618a22aad:
>
>     As it reached Linus' tree with v4.15-rc3, I recently noticed the
>     following commit that triggered a Kconfig request. I believe that this
>     change does not make sense.
>
>     7a9618a22aa usb: gadget: allow to enable legacy drivers without USB_ETH
>
>     USB_ETH was not a dependency, but a default value for the choice. As the
>     choice was marked as "optional", it was possible to remove this value
>     when building.
>
>     After this modification, the Kconfig choice option does not contain
>     anything anymore, so it is useless.  It is also possible to select
>     multiple built-in legacy drivers. This builds, but will not work as
>     expected as only one legacy driver can be bound to an USB device
>     controller at a time.
>
> Hence revert commit 7a9618a22aad.
>
> Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
> Cc: Romain Izard <romain.izard.pro@gmail.com>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
> Cc: Hannes Reinecke <hare@suse.com>
> Cc: Nicholas Bellinger <nab@linux-iscsi.org>
> Cc: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
> Cc: linux-usb@vger.kernel.org
> Cc: Felipe Balbi <felipe.balbi@linux.intel.com>

this doesn't apply at all. Patch is not properly formatted.

Revert "usb: gadget: allow to enable legacy drivers without USB_ETH"

[Arnd Bergmann]

On Mon, Dec 11, 2017 at 5:45 PM, Bart Van Assche <bart.vanassche@wdc.com> wrote:
> Romain Izard reported the following about commit 7a9618a22aad:
>
>     As it reached Linus' tree with v4.15-rc3, I recently noticed the
>     following commit that triggered a Kconfig request. I believe that this
>     change does not make sense.
>
>     7a9618a22aa usb: gadget: allow to enable legacy drivers without USB_ETH
>
>     USB_ETH was not a dependency, but a default value for the choice. As the
>     choice was marked as "optional", it was possible to remove this value
>     when building.
>
>     After this modification, the Kconfig choice option does not contain
>     anything anymore, so it is useless.  It is also possible to select
>     multiple built-in legacy drivers. This builds, but will not work as
>     expected as only one legacy driver can be bound to an USB device
>     controller at a time.
>
> Hence revert commit 7a9618a22aad.
>
> Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
> Cc: Romain Izard <romain.izard.pro@gmail.com>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
> Cc: Hannes Reinecke <hare@suse.com>
> Cc: Nicholas Bellinger <nab@linux-iscsi.org>
> Cc: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
> Cc: linux-usb@vger.kernel.org
> Cc: Felipe Balbi <felipe.balbi@linux.intel.com>

Ok, let's use this one instead of my patch then,

Acked-by: Arnd Bergmann <arnd@arndb.de>
---
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Revert "usb: gadget: allow to enable legacy drivers without USB_ETH"

[Bart Van Assche]

Romain Izard reported the following about commit 7a9618a22aad:

    As it reached Linus' tree with v4.15-rc3, I recently noticed the
    following commit that triggered a Kconfig request. I believe that this
    change does not make sense.

    7a9618a22aa usb: gadget: allow to enable legacy drivers without USB_ETH

    USB_ETH was not a dependency, but a default value for the choice. As the
    choice was marked as "optional", it was possible to remove this value
    when building.

    After this modification, the Kconfig choice option does not contain
    anything anymore, so it is useless.  It is also possible to select
    multiple built-in legacy drivers. This builds, but will not work as
    expected as only one legacy driver can be bound to an USB device
    controller at a time.

Hence revert commit 7a9618a22aad.

Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
Cc: Romain Izard <romain.izard.pro@gmail.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Hannes Reinecke <hare@suse.com>
Cc: Nicholas Bellinger <nab@linux-iscsi.org>
Cc: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Cc: linux-usb@vger.kernel.org
Cc: Felipe Balbi <felipe.balbi@linux.intel.com>

diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 31cce7805eb2..0a19a76645ad 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -508,8 +508,8 @@ choice
 	  controller, and the relevant drivers for each function declared
 	  by the device.

-source "drivers/usb/gadget/legacy/Kconfig"
-
 endchoice

+source "drivers/usb/gadget/legacy/Kconfig"
+
 endif # USB_GADGET
diff --git a/drivers/usb/gadget/legacy/Kconfig b/drivers/usb/gadget/legacy/Kconfig
index a12fb459dbd9..9570bbeced4f 100644
--- a/drivers/usb/gadget/legacy/Kconfig
+++ b/drivers/usb/gadget/legacy/Kconfig
@@ -13,6 +13,14 @@
 # both kinds of controller can also support "USB On-the-Go" (CONFIG_USB_OTG).
 #

+menuconfig USB_GADGET_LEGACY
+	bool "Legacy USB Gadget Support"
+	help
+	   Legacy USB gadgets are USB gadgets that do not use the USB gadget
+	   configfs interface.
+
+if USB_GADGET_LEGACY
+
 config USB_ZERO
 	tristate "Gadget Zero (DEVELOPMENT)"
 	select USB_LIBCOMPOSITE
@@ -490,3 +498,5 @@ config USB_G_WEBCAM

 	  Say "y" to link the driver statically, or "m" to build a
 	  dynamically linked module called "g_webcam".
+
+endif
:
---
 drivers/usb/gadget/Kconfig        |  4 ++--
 drivers/usb/gadget/legacy/Kconfig | 10 ----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 0a19a76645ad..31cce7805eb2 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -508,8 +508,8 @@ choice
 	  controller, and the relevant drivers for each function declared
 	  by the device.
 
-endchoice
-
 source "drivers/usb/gadget/legacy/Kconfig"
 
+endchoice
+
 endif # USB_GADGET
diff --git a/drivers/usb/gadget/legacy/Kconfig b/drivers/usb/gadget/legacy/Kconfig
index 9570bbeced4f..a12fb459dbd9 100644
--- a/drivers/usb/gadget/legacy/Kconfig
+++ b/drivers/usb/gadget/legacy/Kconfig
@@ -13,14 +13,6 @@
 # both kinds of controller can also support "USB On-the-Go" (CONFIG_USB_OTG).
 #
 
-menuconfig USB_GADGET_LEGACY
-	bool "Legacy USB Gadget Support"
-	help
-	   Legacy USB gadgets are USB gadgets that do not use the USB gadget
-	   configfs interface.
-
-if USB_GADGET_LEGACY
-
 config USB_ZERO
 	tristate "Gadget Zero (DEVELOPMENT)"
 	select USB_LIBCOMPOSITE
@@ -498,5 +490,3 @@ config USB_G_WEBCAM
 
 	  Say "y" to link the driver statically, or "m" to build a
 	  dynamically linked module called "g_webcam".
-
-endif