From patchwork Tue May 28 07:54:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?Q2h1bmZlbmcgWXVuICjkupHmmKXls7Ap?= X-Patchwork-Id: 10964053 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 18FDF1575 for ; Tue, 28 May 2019 07:55:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0DFF2274D0 for ; Tue, 28 May 2019 07:55:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0256D2856E; Tue, 28 May 2019 07:55:23 +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=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI,UNPARSEABLE_RELAY 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 3CD74274D0 for ; Tue, 28 May 2019 07:55:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727581AbfE1HzW (ORCPT ); Tue, 28 May 2019 03:55:22 -0400 Received: from mailgw02.mediatek.com ([1.203.163.81]:14207 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726789AbfE1HzW (ORCPT ); Tue, 28 May 2019 03:55:22 -0400 X-UUID: 2c54a368901941008760f6ac2ddf19e5-20190528 X-UUID: 2c54a368901941008760f6ac2ddf19e5-20190528 Received: from mtkcas34.mediatek.inc [(172.27.4.253)] by mailgw02.mediatek.com (envelope-from ) (mailgw01.mediatek.com ESMTP with TLS) with ESMTP id 1469220644; Tue, 28 May 2019 15:55:16 +0800 Received: from mtkcas09.mediatek.inc (172.21.101.178) by MTKMBS31N2.mediatek.inc (172.27.4.87) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Tue, 28 May 2019 15:55:15 +0800 Received: from localhost.localdomain (10.17.3.153) by mtkcas09.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Tue, 28 May 2019 15:55:14 +0800 From: Chunfeng Yun To: Greg Kroah-Hartman CC: Matthias Brugger , Randy Dunlap , Chunfeng Yun , , , , Subject: [v3 PATCH] usb: create usb_debug_root for gadget only Date: Tue, 28 May 2019 15:54:59 +0800 Message-ID: X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 X-MTK: N Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When CONFIG_USB is not set, and CONFIG_USB_GADGET is set, there is an issue, e.g.: drivers/usb/mtu3/mtu3_debugfs.o: in function 'ssusb_debugfs_create_root': mtu3_debugfs.c:(.text+0xba3): undefined reference to 'usb_debug_root' usb_debug_root is currently only built when host is supported (CONFIG_USB is set), for convenience, we also want it created when gadget only is enabled, this patch try to support it. Reported-by: Randy Dunlap Signed-off-by: Chunfeng Yun --- v3: 1. still create usb_debug_root for gadget only 2. abandon mtu3's change 3. drop acked-by Randy v2(resend): add acked-by Randy v1: fix mtu3's build error, replace usb_debug_root by NULL; --- drivers/usb/core/usb.c | 2 +- drivers/usb/gadget/udc/core.c | 27 +++++++++++++++++++++++++++ include/linux/usb.h | 1 + 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c index 7fcb9f782931..88b3ee03a12d 100644 --- a/drivers/usb/core/usb.c +++ b/drivers/usb/core/usb.c @@ -1190,7 +1190,7 @@ EXPORT_SYMBOL_GPL(usb_debug_root); static void usb_debugfs_init(void) { - usb_debug_root = debugfs_create_dir("usb", NULL); + usb_debug_root = debugfs_create_dir(USB_DEBUG_ROOT_NAME, NULL); debugfs_create_file("devices", 0444, usb_debug_root, NULL, &usbfs_devices_fops); } diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c index 7cf34beb50df..ed45f9429e58 100644 --- a/drivers/usb/gadget/udc/core.c +++ b/drivers/usb/gadget/udc/core.c @@ -8,6 +8,7 @@ #include #include +#include #include #include #include @@ -1587,12 +1588,37 @@ static int usb_udc_uevent(struct device *dev, struct kobj_uevent_env *env) return 0; } +/* if CONFIG_USB is set, leave USB core to create usb_debug_root */ +#ifndef CONFIG_USB +struct dentry *usb_debug_root; +EXPORT_SYMBOL_GPL(usb_debug_root); + +static void usb_debugfs_init(void) +{ + usb_debug_root = debugfs_create_dir(USB_DEBUG_ROOT_NAME, NULL); +} + +static void usb_debugfs_cleanup(void) +{ + debugfs_remove_recursive(usb_debug_root); +} +#else +static void usb_debugfs_init(void) +{} + +static void usb_debugfs_cleanup(void) +{} +#endif + static int __init usb_udc_init(void) { + usb_debugfs_init(); + udc_class = class_create(THIS_MODULE, "udc"); if (IS_ERR(udc_class)) { pr_err("failed to create udc class --> %ld\n", PTR_ERR(udc_class)); + usb_debugfs_cleanup(); return PTR_ERR(udc_class); } @@ -1604,6 +1630,7 @@ subsys_initcall(usb_udc_init); static void __exit usb_udc_exit(void) { class_destroy(udc_class); + usb_debugfs_cleanup(); } module_exit(usb_udc_exit); diff --git a/include/linux/usb.h b/include/linux/usb.h index ae82d9d1112b..9c6e7b3265af 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h @@ -1994,6 +1994,7 @@ extern void usb_register_notify(struct notifier_block *nb); extern void usb_unregister_notify(struct notifier_block *nb); /* debugfs stuff */ +#define USB_DEBUG_ROOT_NAME "usb" extern struct dentry *usb_debug_root; /* LED triggers */