Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

USB: add the usbfs devices file to debugfs

People are very used to the devices file in usbfs. Now that we have
moved usbfs to be an "embedded" option only, the developers miss the
file, they had grown quite attached to it over all of these years. This
patch brings it back and puts it in the usb debugfs directory, so that
the developers don't feel sad anymore.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

+15 -2
+2 -2
drivers/usb/core/Makefile
··· 4 4 5 5 usbcore-objs := usb.o hub.o hcd.o urb.o message.o driver.o \ 6 6 config.o file.o buffer.o sysfs.o endpoint.o \ 7 - devio.o notify.o generic.o quirks.o 7 + devio.o notify.o generic.o quirks.o devices.o 8 8 9 9 ifeq ($(CONFIG_PCI),y) 10 10 usbcore-objs += hcd-pci.o 11 11 endif 12 12 13 13 ifeq ($(CONFIG_USB_DEVICEFS),y) 14 - usbcore-objs += inode.o devices.o 14 + usbcore-objs += inode.o 15 15 endif 16 16 17 17 obj-$(CONFIG_USB) += usbcore.o
+13
drivers/usb/core/usb.c
··· 1005 1005 struct dentry *usb_debug_root; 1006 1006 EXPORT_SYMBOL_GPL(usb_debug_root); 1007 1007 1008 + struct dentry *usb_debug_devices; 1009 + 1008 1010 static int usb_debugfs_init(void) 1009 1011 { 1010 1012 usb_debug_root = debugfs_create_dir("usb", NULL); 1011 1013 if (!usb_debug_root) 1012 1014 return -ENOENT; 1015 + 1016 + usb_debug_devices = debugfs_create_file("devices", 0444, 1017 + usb_debug_root, NULL, 1018 + &usbfs_devices_fops); 1019 + if (!usb_debug_devices) { 1020 + debugfs_remove(usb_debug_root); 1021 + usb_debug_root = NULL; 1022 + return -ENOENT; 1023 + } 1024 + 1013 1025 return 0; 1014 1026 } 1015 1027 1016 1028 static void usb_debugfs_cleanup(void) 1017 1029 { 1030 + debugfs_remove(usb_debug_devices); 1018 1031 debugfs_remove(usb_debug_root); 1019 1032 } 1020 1033