diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-25 17:15:29 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-29 22:20:03 -0400 |
| commit | fb28d58b72aa9215b26f1d5478462af394a4d253 (patch) | |
| tree | 5452680dca9eab10d59d276e6b3cc53fab7a19a7 /include | |
| parent | 70f3c7586c708bce8f525246c8b27322edc00cc7 (diff) | |
| download | blackbird-op-linux-fb28d58b72aa9215b26f1d5478462af394a4d253.tar.gz blackbird-op-linux-fb28d58b72aa9215b26f1d5478462af394a4d253.zip | |
USB: remove CONFIG_USB_DEVICEFS
This option has been deprecated for many years now, and no userspace
tools use it anymore, so it should be safe to finally remove it.
Reported-by: Kay Sievers <kay@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/usb.h | 7 | ||||
| -rw-r--r-- | include/linux/usb/hcd.h | 23 |
2 files changed, 0 insertions, 30 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h index 45bc7a5225ab..a63c5baa9f65 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h @@ -351,10 +351,6 @@ struct usb_bus { int bandwidth_int_reqs; /* number of Interrupt requests */ int bandwidth_isoc_reqs; /* number of Isoc. requests */ -#ifdef CONFIG_USB_DEVICEFS - struct dentry *usbfs_dentry; /* usbfs dentry entry for the bus */ -#endif - #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) struct mon_bus *mon_bus; /* non-null when associated */ int monitored; /* non-zero when monitored */ @@ -496,9 +492,6 @@ struct usb_device { #ifdef CONFIG_USB_DEVICE_CLASS struct device *usb_classdev; #endif -#ifdef CONFIG_USB_DEVICEFS - struct dentry *usbfs_dentry; -#endif int maxchild; struct usb_device **children; diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h index 5de415707c23..159a08a4a78e 100644 --- a/include/linux/usb/hcd.h +++ b/include/linux/usb/hcd.h @@ -582,29 +582,6 @@ static inline void usb_hcd_resume_root_hub(struct usb_hcd *hcd) } #endif /* CONFIG_USB_SUSPEND */ - -/* - * USB device fs stuff - */ - -#ifdef CONFIG_USB_DEVICEFS - -/* - * these are expected to be called from the USB core/hub thread - * with the kernel lock held - */ -extern void usbfs_update_special(void); -extern int usbfs_init(void); -extern void usbfs_cleanup(void); - -#else /* CONFIG_USB_DEVICEFS */ - -static inline void usbfs_update_special(void) {} -static inline int usbfs_init(void) { return 0; } -static inline void usbfs_cleanup(void) { } - -#endif /* CONFIG_USB_DEVICEFS */ - /*-------------------------------------------------------------------------*/ #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) |
