From patchwork Tue Oct 31 18:03:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 10035083 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2FE9E60327 for ; Tue, 31 Oct 2017 18:03:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 27D462884E for ; Tue, 31 Oct 2017 18:03:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1CCF328A5F; Tue, 31 Oct 2017 18:03:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 771032884E for ; Tue, 31 Oct 2017 18:03:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932637AbdJaSDe (ORCPT ); Tue, 31 Oct 2017 14:03:34 -0400 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:38505 "EHLO esa4.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932652AbdJaSD3 (ORCPT ); Tue, 31 Oct 2017 14:03:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1509473009; x=1541009009; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=j/WReJgOOjEMiArCiKRVyVdW4rG2qL2Pbk2xOhA01Wo=; b=HzFgdRY6xzR5zQgWhtWtL51uivY3N3iv7mUB6mKPrUsjsEUZ/X3lKMWF /46GBhZ+/I7vNWK9gIvHZEtfYuC2ac6dT3d1XglfPsI4rjaQIVXPyJAyx ByZ64bXMwNiToLbILxwbYxl14Nf0bqoJDFkKUDBo+hKCOZXEZYkAsqC/S o0l2ew7p2y1hfzSqOBFmdSz4R8S22R8G1LTH/CkoL9MI+zu2kY43280iB HGH+s/WUFxVw3AqBTe1pkbMnAZyKWyRQJTo/p3ou+FgMd+yz2ow8abH0g yIQdFO3n8AyTN/QEu4YNrCxicV9zHcPZ3kwlYOCave1YaciXN1iIGRJWB w==; X-IronPort-AV: E=Sophos;i="5.44,325,1505750400"; d="scan'208";a="60328655" Received: from h199-255-45-15.hgst.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 01 Nov 2017 02:03:25 +0800 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP; 31 Oct 2017 11:01:09 -0700 Received: from unknown (HELO MILHUBIP03.sdcorp.global.sandisk.com) ([10.177.9.96]) by uls-op-cesaip02.wdc.com with ESMTP; 31 Oct 2017 11:03:25 -0700 Received: from milsmgip12.sandisk.com (10.177.8.100) by MILHUBIP03.sdcorp.global.sandisk.com (10.177.9.96) with Microsoft SMTP Server id 14.3.319.2; Tue, 31 Oct 2017 11:03:23 -0700 X-AuditID: 0ab1095a-d99e3980000146e4-56-59f8baebf079 Received: from thinkpad-bart.int.fusionio.com ( [10.177.8.100]) by (Symantec Messaging Gateway) with SMTP id BD.A9.18148.BEAB8F95; Tue, 31 Oct 2017 11:03:23 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" , "James E . J . Bottomley" CC: Nicholas Bellinger , Christoph Hellwig , , Bart Van Assche , Andrzej Pietrasiewicz , Felipe Balbi , Subject: [PATCH 11/11] usb/gadget: Make it again possible to enable the legacy drivers without enabling USB_ETH Date: Tue, 31 Oct 2017 11:03:19 -0700 Message-ID: <20171031180319.19258-12-bart.vanassche@wdc.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171031180319.19258-1-bart.vanassche@wdc.com> References: <20171031180319.19258-1-bart.vanassche@wdc.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrKJMWRmVeSWpSXmKPExsXCtZEjRff1rh+RBpvmcljMetnOYnHwfr3F pT9fGC1Wrj7KZLFqYp7FomWtzBbLj/9jsmhbfYbRonXpWyYHTo/7248weTw4tJnFY/fNBjaP j09vsXj0bVnF6HH8xnYmj8+b5DzaD3QzBXBEcdmkpOZklqUW6dslcGWsurGMveAzX8XmazUN jKt5uhg5OSQETCQmLbnK3MXIxSEksJpRonX5DTaQBJuAnsSpefuYQGwRgVyJUw9vMIEUMQu0 M0lMefuKFSQhLJAv8X3nDKBuDg4WAVWJg0dCQUxeARuJq8e9IebLS7xfcJ8RxOYECr/t2c0C YgsJWEtc27uEeQIj9wJGhlWMYrmZOcW56ZkFhkZ6xYl5KZnF2XrJ+bmbGMEBxRm1g/H6RPND jEwcnFINjMs2CXJsWLdMslbOVvuV8fFk5o89V79/VzqvfaW43nDDOe/DvByS/ve+h3YsWC/3 g3OHx4LCuUm/UrQ799k3rMviD/4q/sDVl1O75nnD1VA9Xob7CQF3vBQL1X1u+/ox1t18vzOF Se3lwW837E592Hz8sr1/tP/2Z89a3q2XU/kV/63s+OQ3kkosxRmJhlrMRcWJAHWUTiHYAQAA MIME-Version: 1.0 Sender: target-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: target-devel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Considerable time ago the legacy gadget menu was added inside the USB_ETH choice. I think this was a mistake and that the legacy gadget menu should have been added after "endchoice" instead of before. Hence this patch. Fixes: commit 8443f2d2b778 ("usb: gadget: Gadget directory cleanup - group legacy gadgets") Signed-off-by: Bart Van Assche Cc: Nicholas Bellinger Cc: Andrzej Pietrasiewicz Cc: Felipe Balbi Cc: linux-usb@vger.kernel.org Reviewed-by: Hannes Reinecke --- drivers/usb/gadget/Kconfig | 4 ++-- drivers/usb/gadget/legacy/Kconfig | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) 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