aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-25 20:15:29 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-29 22:20:03 -0400
commitfb28d58b72aa9215b26f1d5478462af394a4d253 (patch)
tree5452680dca9eab10d59d276e6b3cc53fab7a19a7 /include
parent70f3c7586c708bce8f525246c8b27322edc00cc7 (diff)
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.h7
-rw-r--r--include/linux/usb/hcd.h23
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 {
351 int bandwidth_int_reqs; /* number of Interrupt requests */ 351 int bandwidth_int_reqs; /* number of Interrupt requests */
352 int bandwidth_isoc_reqs; /* number of Isoc. requests */ 352 int bandwidth_isoc_reqs; /* number of Isoc. requests */
353 353
354#ifdef CONFIG_USB_DEVICEFS
355 struct dentry *usbfs_dentry; /* usbfs dentry entry for the bus */
356#endif
357
358#if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) 354#if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
359 struct mon_bus *mon_bus; /* non-null when associated */ 355 struct mon_bus *mon_bus; /* non-null when associated */
360 int monitored; /* non-zero when monitored */ 356 int monitored; /* non-zero when monitored */
@@ -496,9 +492,6 @@ struct usb_device {
496#ifdef CONFIG_USB_DEVICE_CLASS 492#ifdef CONFIG_USB_DEVICE_CLASS
497 struct device *usb_classdev; 493 struct device *usb_classdev;
498#endif 494#endif
499#ifdef CONFIG_USB_DEVICEFS
500 struct dentry *usbfs_dentry;
501#endif
502 495
503 int maxchild; 496 int maxchild;
504 struct usb_device **children; 497 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)
582} 582}
583#endif /* CONFIG_USB_SUSPEND */ 583#endif /* CONFIG_USB_SUSPEND */
584 584
585
586/*
587 * USB device fs stuff
588 */
589
590#ifdef CONFIG_USB_DEVICEFS
591
592/*
593 * these are expected to be called from the USB core/hub thread
594 * with the kernel lock held
595 */
596extern void usbfs_update_special(void);
597extern int usbfs_init(void);
598extern void usbfs_cleanup(void);
599
600#else /* CONFIG_USB_DEVICEFS */
601
602static inline void usbfs_update_special(void) {}
603static inline int usbfs_init(void) { return 0; }
604static inline void usbfs_cleanup(void) { }
605
606#endif /* CONFIG_USB_DEVICEFS */
607
608/*-------------------------------------------------------------------------*/ 585/*-------------------------------------------------------------------------*/
609 586
610#if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) 587#if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)