USB: move usb debugfs directory creation to the usb common core
Subsystems (2)
Greg Kroah-Hartman
maintainerPATCH v2 1/1 USB: move usb debugfs directory creation to the usb common core
The USB gadget subsystem wants to use the USB debugfs root directory, so move it to the common "core" USB code so that it is properly initialized and removed as needed.
In order to properly do this, we need to load the common code before the usb core code, when everything is linked into the kernel, so reorder the link order of the code.
Also as the usb common code has the possibility of the led trigger logic to be merged into it, handle the build option properly by only having one module init/exit function and have the common code initialize the led trigger if needed.
---
Chunfeng, can you test this version to verify it works for you when building the code into the kernel?
v2: handle led common code link error reported by kbuild
handle subsys_initcall issue pointed out by Chunfeng
drivers/usb/Makefile | 3 +-- drivers/usb/common/common.c | 21 +++++++++++++++++++++ drivers/usb/common/common.h | 14 ++++++++++++++ drivers/usb/common/led.c | 9 +++------ drivers/usb/core/usb.c | 10 ++++------ 5 files changed, 43 insertions(+), 14 deletions(-) create mode 100644 drivers/usb/common/common.h
drivers/usb/Makefile +1 -2
@@ -5,6 +5,7 @@ # Object files in subdirectories +obj-$(CONFIG_USB_COMMON) += common/ obj-$(CONFIG_USB) += core/ obj-$(CONFIG_USB_SUPPORT) += phy/
@@ -60,8 +61,6 @@ obj-$(CONFIG_USB_CHIPIDEA) += chipidea/ obj-$(CONFIG_USB_RENESAS_USBHS) += renesas_usbhs/ obj-$(CONFIG_USB_GADGET) += gadget/ -obj-$(CONFIG_USB_COMMON) += common/ - obj-$(CONFIG_USBIP_CORE) += usbip/ obj-$(CONFIG_TYPEC) += typec/
drivers/usb/common/common.c +21 -0
@@ -15,6 +15,8 @@#include <linux/usb/of.h> #include <linux/usb/otg.h> #include <linux/of_platform.h> +#include <linux/debugfs.h> +#include "common.h" static const char *const ep_type_names[] = { [USB_ENDPOINT_XFER_CONTROL ] ="ctrl" ,
@@ -291,4 +293,23 @@ struct device *usb_of_get_companion_dev(struct device *dev)EXPORT_SYMBOL_GPL (usb_of_get_companion_dev);#endif +struct dentry *usb_debug_root; +EXPORT_SYMBOL_GPL (usb_debug_root); + +static int usb_common_init (void ) +{ + usb_debug_root =debugfs_create_dir ("usb" ,NULL ); +ledtrig_usb_init (); +return 0 ; +} + +static void usb_common_exit (void ) +{ +ledtrig_usb_exit (); +debugfs_remove_recursive (usb_debug_root); +} + +subsys_initcall (usb_common_init); +module_exit (usb_common_exit); +MODULE_LICENSE ("GPL" );
drivers/usb/common/common.h new file +14 -0
@@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __LINUX_USB_COMMON_H +#define __LINUX_USB_COMMON_H + +#if defined(CONFIG_USB_LED_TRIG ) +void ledtrig_usb_init (void ); +void ledtrig_usb_exit (void ); +#else +static inline void ledtrig_usb_init (void ) { } +static inline void ledtrig_usb_exit (void ) { } +#endif + +#endif /* __LINUX_USB_COMMON_H */
drivers/usb/common/led.c +3 -6
@@ -10,6 +10,7 @@#include <linux/init.h> #include <linux/leds.h> #include <linux/usb.h> +#include "common.h" #define BLINK_DELAY 30
@@ -36,18 +37,14 @@ void usb_led_activity(enum usb_led_event ev)EXPORT_SYMBOL_GPL (usb_led_activity); -static int __init ledtrig_usb_init (void ) +void __init ledtrig_usb_init (void ) {led_trigger_register_simple ("usb-gadget" , &ledtrig_usb_gadget);led_trigger_register_simple ("usb-host" , &ledtrig_usb_host); -return 0 ; } -static void __exit ledtrig_usb_exit(void) +void __exit ledtrig_usb_exit(void) {led_trigger_unregister_simple (ledtrig_usb_gadget);led_trigger_unregister_simple (ledtrig_usb_host); } - -module_init (ledtrig_usb_init); -module_exit (ledtrig_usb_exit);
drivers/usb/core/usb.c +4 -6
@@ -1185,19 +1185,17 @@ static struct notifier_block usb_bus_nb = { .notifier_call = usb_bus_notify, }; -struct dentry *usb_debug_root; -EXPORT_SYMBOL_GPL (usb_debug_root); +static struct dentry *usb_devices_root;static void usb_debugfs_init (void ) { - usb_debug_root =debugfs_create_dir ("usb" ,NULL ); -debugfs_create_file ("devices" ,0444 , usb_debug_root,NULL , - &usbfs_devices_fops); + usb_devices_root =debugfs_create_file ("devices" ,0444 , usb_debug_root, +NULL , &usbfs_devices_fops); }static void usb_debugfs_cleanup (void ) { -debugfs_remove_recursive (usb_debug_root); +debugfs_remove (usb_devices_root); }/*
Signature · 1 line
2.21.0
Hi Greg,
Quoted 76 lines · Greg Kroah-Hartman
The USB gadget subsystem wants to use the USB debugfs root directory, so move it to the common "core" USB code so that it is properly initialized and removed as needed.
In order to properly do this, we need to load the common code before the usb core code, when everything is linked into the kernel, so reorder the link order of the code.
Also as the usb common code has the possibility of the led trigger logic to be merged into it, handle the build option properly by only having one module init/exit function and have the common code initialize the led trigger if needed.
Reported-by From: Chunfeng Yun <[email protected]>Cc Felipe Balbi <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>---
Chunfeng, can you test this version to verify it works for you when building the code into the kernel?
v2: handle led common code link error reported by kbuild
handlesubsys_initcallissue pointed out by Chunfengdrivers/usb/Makefile | 3 +-- drivers/usb/common/common.c | 21 +++++++++++++++++++++ drivers/usb/common/common.h | 14 ++++++++++++++ drivers/usb/common/led.c | 9 +++------ drivers/usb/core/usb.c | 10 ++++------ 5 files changed, 43 insertions(+), 14 deletions(-) create mode 100644 drivers/usb/common/common.hdrivers/usb/Makefile +1
-2@@ -5,6 +5,7 @@ # Object files in subdirectories +obj-$(CONFIG_USB_COMMON) += common/ obj-$(CONFIG_USB) += core/ obj-$(CONFIG_USB_SUPPORT) += phy/@@ -60,8 +61,6 @@ obj-$(CONFIG_USB_CHIPIDEA) += chipidea/ obj-$(CONFIG_USB_RENESAS_USBHS) += renesas_usbhs/ obj-$(CONFIG_USB_GADGET) += gadget/ -obj-$(CONFIG_USB_COMMON) += common/ - obj-$(CONFIG_USBIP_CORE) += usbip/ obj-$(CONFIG_TYPEC) += typec/drivers/usb/common/common.c +8
-0@@ -15,6 +15,8 @@#include <linux/usb/of.h> #include <linux/usb/otg.h> #include <linux/of_platform.h> +#include <linux/debugfs.h> +#include "common.h" static const char *const ep_type_names[] = { [USB_ENDPOINT_XFER_CONTROL ] ="ctrl" ,@@ -291,4 +293,23 @@ struct device *usb_of_get_companion_dev(struct device *dev)EXPORT_SYMBOL_GPL (usb_of_get_companion_dev);#endif +struct dentry *usb_debug_root; +EXPORT_SYMBOL_GPL (usb_debug_root); + +static int usb_common_init (void ) +{ + usb_debug_root =debugfs_create_dir ("usb" ,NULL );
drivers/usb/common/common.c struct device *usb_of_get_companion_dev(struct device *dev) · line 311
Quoted 10 lines
drivers/usb/common/common.c +10
-0+ledtrig_usb_init (); +return 0 ; +} + +static void usb_common_exit (void ) +{ +ledtrig_usb_exit (); +debugfs_remove_recursive (usb_debug_root); +} +
When enable CONFIG_LED_TRIGGER, there is a warning
MODPOST vmlinux.o
WARNING: vmlinux.o(.text+0x68e300): Section mismatch in reference from the function usb_common_init() to the
function .init.text:ledtrig_usb_init()
The function usb_common_init() references
the function __init ledtrig_usb_init().
This is often because usb_common_init lacks a __init annotation or the annotation of ledtrig_usb_init is wrong.
WARNING: vmlinux.o(.text+0x68e318): Section mismatch in reference from the function usb_common_exit() to the
function .exit.text:ledtrig_usb_exit()
The function usb_common_exit() references a function in an exit section. Often the function ledtrig_usb_exit() has valid usage outside the exit section
and the fix is to remove the __exit annotation of ledtrig_usb_exit.
seems need add __init and __exit for usb_common_init/exit
Quoted 85 lines
drivers/usb/common/common.c +3
-0+subsys_initcall (usb_common_init); +module_exit (usb_common_exit); +MODULE_LICENSE ("GPL" );drivers/usb/common/common.h new file +14
-0@@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __LINUX_USB_COMMON_H +#define __LINUX_USB_COMMON_H + +#if defined(CONFIG_USB_LED_TRIG ) +void ledtrig_usb_init (void ); +void ledtrig_usb_exit (void ); +#else +static inline void ledtrig_usb_init (void ) { } +static inline void ledtrig_usb_exit (void ) { } +#endif + +#endif /* __LINUX_USB_COMMON_H */ drivers/usb/common/led.c +3
-6@@ -10,6 +10,7 @@#include <linux/init.h> #include <linux/leds.h> #include <linux/usb.h> +#include "common.h" #define BLINK_DELAY 30@@ -36,18 +37,14 @@ void usb_led_activity(enum usb_led_event ev)EXPORT_SYMBOL_GPL (usb_led_activity); -static int __init ledtrig_usb_init (void ) +void __init ledtrig_usb_init (void ) {led_trigger_register_simple ("usb-gadget" , &ledtrig_usb_gadget);led_trigger_register_simple ("usb-host" , &ledtrig_usb_host); -return 0 ; } -static void __exit ledtrig_usb_exit(void) +void __exit ledtrig_usb_exit(void) {led_trigger_unregister_simple (ledtrig_usb_gadget);led_trigger_unregister_simple (ledtrig_usb_host); } - -module_init (ledtrig_usb_init); -module_exit (ledtrig_usb_exit);drivers/usb/core/usb.c +4
-6@@ -1185,19 +1185,17 @@ static struct notifier_block usb_bus_nb = { .notifier_call = usb_bus_notify, }; -struct dentry *usb_debug_root; -EXPORT_SYMBOL_GPL (usb_debug_root); +static struct dentry *usb_devices_root;static void usb_debugfs_init (void ) { - usb_debug_root =debugfs_create_dir ("usb" ,NULL ); -debugfs_create_file ("devices" ,0444 , usb_debug_root,NULL , - &usbfs_devices_fops); + usb_devices_root =debugfs_create_file ("devices" ,0444 , usb_debug_root, +NULL , &usbfs_devices_fops); }static void usb_debugfs_cleanup (void ) { -debugfs_remove_recursive (usb_debug_root); +debugfs_remove (usb_devices_root); }/*
Quoted 8 lines · Greg Kroah-Hartman
The USB gadget subsystem wants to use the USB debugfs root directory, so move it to the common "core" USB code so that it is properly initialized and removed as needed.
In order to properly do this, we need to load the common code before the usb core code, when everything is linked into the kernel, so reorder the link order of the code.
Quoted 6 lines
Also as the usb common code has the possibility of the led trigger logic to be merged into it, handle the build option properly by only having one module init/exit function and have the common code initialize the led trigger if needed.
Reported-by From: Chunfeng Yun <[email protected]>
You have a spurious "From: " in there ;-)
Regards.
Greg Kroah-Hartman
maintainerQuoted 10 lines · Marc Gonzalez
Quoted 8 lines · Greg Kroah-Hartman
The USB gadget subsystem wants to use the USB debugfs root directory, so move it to the common "core" USB code so that it is properly initialized and removed as needed.
In order to properly do this, we need to load the common code before the usb core code, when everything is linked into the kernel, so reorder the link order of the code.
Quoted 8 lines
Quoted 6 lines
Also as the usb common code has the possibility of the led trigger logic to be merged into it, handle the build option properly by only having one module init/exit function and have the common code initialize the led trigger if needed.
Reported-by From: Chunfeng Yun <[email protected]>You have a spurious "From: " in there ;-)
Ugh, cut/paste error, thanks, will fix!
Greg Kroah-Hartman
maintainerQuoted 107 lines · Chunfeng Yun
Hi Greg,
Quoted 76 lines · Greg Kroah-Hartman
The USB gadget subsystem wants to use the USB debugfs root directory, so move it to the common "core" USB code so that it is properly initialized and removed as needed.
In order to properly do this, we need to load the common code before the usb core code, when everything is linked into the kernel, so reorder the link order of the code.
Also as the usb common code has the possibility of the led trigger logic to be merged into it, handle the build option properly by only having one module init/exit function and have the common code initialize the led trigger if needed.
Reported-by From: Chunfeng Yun <[email protected]>Cc Felipe Balbi <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>---
Chunfeng, can you test this version to verify it works for you when building the code into the kernel?
v2: handle led common code link error reported by kbuild
handlesubsys_initcallissue pointed out by Chunfengdrivers/usb/Makefile | 3 +-- drivers/usb/common/common.c | 21 +++++++++++++++++++++ drivers/usb/common/common.h | 14 ++++++++++++++ drivers/usb/common/led.c | 9 +++------ drivers/usb/core/usb.c | 10 ++++------ 5 files changed, 43 insertions(+), 14 deletions(-) create mode 100644 drivers/usb/common/common.hdrivers/usb/Makefile +1
-2@@ -5,6 +5,7 @@ # Object files in subdirectories +obj-$(CONFIG_USB_COMMON) += common/ obj-$(CONFIG_USB) += core/ obj-$(CONFIG_USB_SUPPORT) += phy/@@ -60,8 +61,6 @@ obj-$(CONFIG_USB_CHIPIDEA) += chipidea/ obj-$(CONFIG_USB_RENESAS_USBHS) += renesas_usbhs/ obj-$(CONFIG_USB_GADGET) += gadget/ -obj-$(CONFIG_USB_COMMON) += common/ - obj-$(CONFIG_USBIP_CORE) += usbip/ obj-$(CONFIG_TYPEC) += typec/drivers/usb/common/common.c +8
-0@@ -15,6 +15,8 @@#include <linux/usb/of.h> #include <linux/usb/otg.h> #include <linux/of_platform.h> +#include <linux/debugfs.h> +#include "common.h" static const char *const ep_type_names[] = { [USB_ENDPOINT_XFER_CONTROL ] ="ctrl" ,@@ -291,4 +293,23 @@ struct device *usb_of_get_companion_dev(struct device *dev)EXPORT_SYMBOL_GPL (usb_of_get_companion_dev);#endif +struct dentry *usb_debug_root; +EXPORT_SYMBOL_GPL (usb_debug_root); + +static int usb_common_init (void ) +{ + usb_debug_root =debugfs_create_dir ("usb" ,NULL );drivers/usb/common/common.c struct device *usb_of_get_companion_dev(struct device *dev) · line 311
Quoted 10 lines
drivers/usb/common/common.c +10
-0+ledtrig_usb_init (); +return 0 ; +} + +static void usb_common_exit (void ) +{ +ledtrig_usb_exit (); +debugfs_remove_recursive (usb_debug_root); +} +When enable
CONFIG_LED_TRIGGER, there is a warningMODPOST vmlinux.o
WARNING:vmlinux.o(.text+0x68e300): Section mismatch in reference from the functionusb_common_init()to the
function .init.text:ledtrig_usb_init()
The functionusb_common_init()references
the function__initledtrig_usb_init().
This is often becauseusb_common_initlacks a__initannotation or the annotation ofledtrig_usb_initis wrong.WARNING:
vmlinux.o(.text+0x68e318): Section mismatch in reference from the functionusb_common_exit()to the
function .exit.text:ledtrig_usb_exit()
The functionusb_common_exit()references a function in an exit section. Often the functionledtrig_usb_exit()has valid usage outside the exit section
and the fix is to remove the__exitannotation ofledtrig_usb_exit.
Quoted 1 line
seems need add
__initand__exitfor usb_common_init/exit
Yes, you are right, I'll go add those markings to those functions, good catch.
greg k-h
Greg Kroah-Hartman
maintainerPATCH v3 1/1 USB: move usb debugfs directory creation to the usb common core
In reply to Greg Kroah-HartmanThe USB gadget subsystem wants to use the USB debugfs root directory, so move it to the common "core" USB code so that it is properly initialized and removed as needed.
In order to properly do this, we need to load the common code before the usb core code, when everything is linked into the kernel, so reorder the link order of the code.
Also as the usb common code has the possibility of the led trigger logic to be merged into it, handle the build option properly by only having one module init/exit function and have the common code initialize the led trigger if needed.
---
Chunfeng, can you try testing this again?
v3: Fix __init and __exit error when building into the tree as reported
by Chunfeng
Fix Reported-by: line as reported
v2: handle led common code link error reported by kbuild
handle subsys_initcall issue pointed out by Chunfeng
drivers/usb/Makefile | 3 +-- drivers/usb/common/common.c | 21 +++++++++++++++++++++ drivers/usb/common/common.h | 14 ++++++++++++++ drivers/usb/common/led.c | 9 +++------ drivers/usb/core/usb.c | 10 ++++------ 5 files changed, 43 insertions(+), 14 deletions(-) create mode 100644 drivers/usb/common/common.h
drivers/usb/Makefile +1 -2
@@ -5,6 +5,7 @@ # Object files in subdirectories +obj-$(CONFIG_USB_COMMON) += common/ obj-$(CONFIG_USB) += core/ obj-$(CONFIG_USB_SUPPORT) += phy/
@@ -60,8 +61,6 @@ obj-$(CONFIG_USB_CHIPIDEA) += chipidea/ obj-$(CONFIG_USB_RENESAS_USBHS) += renesas_usbhs/ obj-$(CONFIG_USB_GADGET) += gadget/ -obj-$(CONFIG_USB_COMMON) += common/ - obj-$(CONFIG_USBIP_CORE) += usbip/ obj-$(CONFIG_TYPEC) += typec/
drivers/usb/common/common.c +21 -0
@@ -15,6 +15,8 @@#include <linux/usb/of.h> #include <linux/usb/otg.h> #include <linux/of_platform.h> +#include <linux/debugfs.h> +#include "common.h" static const char *const ep_type_names[] = { [USB_ENDPOINT_XFER_CONTROL ] ="ctrl" ,
@@ -291,4 +293,23 @@ struct device *usb_of_get_companion_dev(struct device *dev)EXPORT_SYMBOL_GPL (usb_of_get_companion_dev);#endif +struct dentry *usb_debug_root; +EXPORT_SYMBOL_GPL (usb_debug_root); + +static int __init usb_common_init (void ) +{ + usb_debug_root =debugfs_create_dir ("usb" ,NULL ); +ledtrig_usb_init (); +return 0 ; +} + +static void __exit usb_common_exit(void) +{ +ledtrig_usb_exit (); +debugfs_remove_recursive (usb_debug_root); +} + +subsys_initcall (usb_common_init); +module_exit (usb_common_exit); +MODULE_LICENSE ("GPL" );
drivers/usb/common/common.h new file +14 -0
@@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __LINUX_USB_COMMON_H +#define __LINUX_USB_COMMON_H + +#if defined(CONFIG_USB_LED_TRIG ) +void ledtrig_usb_init (void ); +void ledtrig_usb_exit (void ); +#else +static inline void ledtrig_usb_init (void ) { } +static inline void ledtrig_usb_exit (void ) { } +#endif + +#endif /* __LINUX_USB_COMMON_H */
drivers/usb/common/led.c +3 -6
@@ -10,6 +10,7 @@#include <linux/init.h> #include <linux/leds.h> #include <linux/usb.h> +#include "common.h" #define BLINK_DELAY 30
@@ -36,18 +37,14 @@ void usb_led_activity(enum usb_led_event ev)EXPORT_SYMBOL_GPL (usb_led_activity); -static int __init ledtrig_usb_init (void ) +void __init ledtrig_usb_init (void ) {led_trigger_register_simple ("usb-gadget" , &ledtrig_usb_gadget);led_trigger_register_simple ("usb-host" , &ledtrig_usb_host); -return 0 ; } -static void __exit ledtrig_usb_exit(void) +void __exit ledtrig_usb_exit(void) {led_trigger_unregister_simple (ledtrig_usb_gadget);led_trigger_unregister_simple (ledtrig_usb_host); } - -module_init (ledtrig_usb_init); -module_exit (ledtrig_usb_exit);
drivers/usb/core/usb.c +4 -6
@@ -1185,19 +1185,17 @@ static struct notifier_block usb_bus_nb = { .notifier_call = usb_bus_notify, }; -struct dentry *usb_debug_root; -EXPORT_SYMBOL_GPL (usb_debug_root); +static struct dentry *usb_devices_root;static void usb_debugfs_init (void ) { - usb_debug_root =debugfs_create_dir ("usb" ,NULL ); -debugfs_create_file ("devices" ,0444 , usb_debug_root,NULL , - &usbfs_devices_fops); + usb_devices_root =debugfs_create_file ("devices" ,0444 , usb_debug_root, +NULL , &usbfs_devices_fops); }static void usb_debugfs_cleanup (void ) { -debugfs_remove_recursive (usb_debug_root); +debugfs_remove (usb_devices_root); }/*
Signature · 1 line
2.21.0
Quoted 13 lines · Greg Kroah-Hartman
The USB gadget subsystem wants to use the USB debugfs root directory, so move it to the common "core" USB code so that it is properly initialized and removed as needed.
In order to properly do this, we need to load the common code before the usb core code, when everything is linked into the kernel, so reorder the link order of the code.
Also as the usb common code has the possibility of the led trigger logic to be merged into it, handle the build option properly by only having one module init/exit function and have the common code initialize the led trigger if needed.
Quoted 5 lines
Reported-by Chunfeng Yun <[email protected]>Cc Felipe Balbi <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>---
Chunfeng, can you try testing this again?
Thank you, Greg, Felipe
Quoted 154 lines
v3: Fix
__initand__exiterror when building into the tree as reported
by Chunfeng
Fix Reported-by: line as reported
v2: handle led common code link error reported by kbuild
handlesubsys_initcallissue pointed out by Chunfengdrivers/usb/Makefile | 3 +-- drivers/usb/common/common.c | 21 +++++++++++++++++++++ drivers/usb/common/common.h | 14 ++++++++++++++ drivers/usb/common/led.c | 9 +++------ drivers/usb/core/usb.c | 10 ++++------ 5 files changed, 43 insertions(+), 14 deletions(-) create mode 100644 drivers/usb/common/common.hdrivers/usb/Makefile +1
-2@@ -5,6 +5,7 @@ # Object files in subdirectories +obj-$(CONFIG_USB_COMMON) += common/ obj-$(CONFIG_USB) += core/ obj-$(CONFIG_USB_SUPPORT) += phy/@@ -60,8 +61,6 @@ obj-$(CONFIG_USB_CHIPIDEA) += chipidea/ obj-$(CONFIG_USB_RENESAS_USBHS) += renesas_usbhs/ obj-$(CONFIG_USB_GADGET) += gadget/ -obj-$(CONFIG_USB_COMMON) += common/ - obj-$(CONFIG_USBIP_CORE) += usbip/ obj-$(CONFIG_TYPEC) += typec/drivers/usb/common/common.c +21
-0@@ -15,6 +15,8 @@#include <linux/usb/of.h> #include <linux/usb/otg.h> #include <linux/of_platform.h> +#include <linux/debugfs.h> +#include "common.h" static const char *const ep_type_names[] = { [USB_ENDPOINT_XFER_CONTROL ] ="ctrl" ,@@ -291,4 +293,23 @@ struct device *usb_of_get_companion_dev(struct device *dev)EXPORT_SYMBOL_GPL (usb_of_get_companion_dev);#endif +struct dentry *usb_debug_root; +EXPORT_SYMBOL_GPL (usb_debug_root); + +static int __init usb_common_init (void ) +{ + usb_debug_root =debugfs_create_dir ("usb" ,NULL ); +ledtrig_usb_init (); +return 0 ; +} + +static void __exit usb_common_exit(void) +{ +ledtrig_usb_exit (); +debugfs_remove_recursive (usb_debug_root); +} + +subsys_initcall (usb_common_init); +module_exit (usb_common_exit); +MODULE_LICENSE ("GPL" );drivers/usb/common/common.h new file +14
-0@@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __LINUX_USB_COMMON_H +#define __LINUX_USB_COMMON_H + +#if defined(CONFIG_USB_LED_TRIG ) +void ledtrig_usb_init (void ); +void ledtrig_usb_exit (void ); +#else +static inline void ledtrig_usb_init (void ) { } +static inline void ledtrig_usb_exit (void ) { } +#endif + +#endif /* __LINUX_USB_COMMON_H */ drivers/usb/common/led.c +3
-6@@ -10,6 +10,7 @@#include <linux/init.h> #include <linux/leds.h> #include <linux/usb.h> +#include "common.h" #define BLINK_DELAY 30@@ -36,18 +37,14 @@ void usb_led_activity(enum usb_led_event ev)EXPORT_SYMBOL_GPL (usb_led_activity); -static int __init ledtrig_usb_init (void ) +void __init ledtrig_usb_init (void ) {led_trigger_register_simple ("usb-gadget" , &ledtrig_usb_gadget);led_trigger_register_simple ("usb-host" , &ledtrig_usb_host); -return 0 ; } -static void __exit ledtrig_usb_exit(void) +void __exit ledtrig_usb_exit(void) {led_trigger_unregister_simple (ledtrig_usb_gadget);led_trigger_unregister_simple (ledtrig_usb_host); } - -module_init (ledtrig_usb_init); -module_exit (ledtrig_usb_exit);drivers/usb/core/usb.c +4
-6@@ -1185,19 +1185,17 @@ static struct notifier_block usb_bus_nb = { .notifier_call = usb_bus_notify, }; -struct dentry *usb_debug_root; -EXPORT_SYMBOL_GPL (usb_debug_root); +static struct dentry *usb_devices_root;static void usb_debugfs_init (void ) { - usb_debug_root =debugfs_create_dir ("usb" ,NULL ); -debugfs_create_file ("devices" ,0444 , usb_debug_root,NULL , - &usbfs_devices_fops); + usb_devices_root =debugfs_create_file ("devices" ,0444 , usb_debug_root, +NULL , &usbfs_devices_fops); }static void usb_debugfs_cleanup (void ) { -debugfs_remove_recursive (usb_debug_root); +debugfs_remove (usb_devices_root); }/*
Greg Kroah-Hartman
maintainerQuoted 20 lines · Chunfeng Yun
Quoted 13 lines · Greg Kroah-Hartman
The USB gadget subsystem wants to use the USB debugfs root directory, so move it to the common "core" USB code so that it is properly initialized and removed as needed.
In order to properly do this, we need to load the common code before the usb core code, when everything is linked into the kernel, so reorder the link order of the code.
Also as the usb common code has the possibility of the led trigger logic to be merged into it, handle the build option properly by only having one module init/exit function and have the common code initialize the led trigger if needed.
Quoted 5 lines
Reported-by Chunfeng Yun <[email protected]>Cc Felipe Balbi <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>---
Chunfeng, can you try testing this again?
Quoted 3 lines
Tested-by Chunfeng Yun <[email protected]>Thank you, Greg, Felipe
Thanks for the review, and all of the different iterations for this. For something so "simple" it sure took us all a number of tries :)
I'll go queue it up now so that your future work can rely on it.
thanks,
greg k-h