Pull sn-recursive-flags-for-select-builds into release branch

[powerpc.git] / drivers / usb / core / file.c

diff --git a/drivers/usb/core/file.c b/drivers/usb/core/file.c
index 78cb4be..37b1336 100644 (file)
--- a/drivers/usb/core/file.c
+++ b/drivers/usb/core/file.c
@@ -17,15 +17,8 @@
 
 #include <linux/config.h>
 #include <linux/module.h>
-#include <linux/devfs_fs_kernel.h>
 #include <linux/spinlock.h>
 #include <linux/errno.h>
-
-#ifdef CONFIG_USB_DEBUG
-       #define DEBUG
-#else
-       #undef DEBUG
-#endif
 #include <linux/usb.h>
 
 #include "usb.h"
@@ -88,8 +81,6 @@ int usb_major_init(void)
                goto out;
        }
 
-       devfs_mk_dir("usb");
-
 out:
        return error;
 }
@@ -97,7 +88,6 @@ out:
 void usb_major_cleanup(void)
 {
        class_destroy(usb_class);
-       devfs_remove("usb");
        unregister_chrdev(USB_MAJOR, "usb");
 }
 
@@ -112,8 +102,7 @@ void usb_major_cleanup(void)
  * enabled, the minor number will be based on the next available free minor,
  * starting at the class_driver->minor_base.
  *
- * This function also creates the devfs file for the usb device, if devfs
- * is enabled, and creates a usb class device in the sysfs tree.
+ * This function also creates a usb class device in the sysfs tree.
  *
  * usb_deregister_dev() must be called when the driver is done with
  * the minor numbers given out by this function.
@@ -162,11 +151,8 @@ int usb_register_dev(struct usb_interface *intf,
 
        intf->minor = minor;
 
-       /* handle the devfs registration */
-       snprintf(name, BUS_ID_SIZE, class_driver->name, minor - minor_base);
-       devfs_mk_cdev(MKDEV(USB_MAJOR, minor), class_driver->mode, name);
-
        /* create a usb class device for this usb interface */
+       snprintf(name, BUS_ID_SIZE, class_driver->name, minor - minor_base);
        temp = strrchr(name, '/');
        if (temp && (temp[1] != 0x00))
                ++temp;
@@ -179,7 +165,6 @@ int usb_register_dev(struct usb_interface *intf,
                spin_lock (&minor_lock);
                usb_minors[intf->minor] = NULL;
                spin_unlock (&minor_lock);
-               devfs_remove (name);
                retval = PTR_ERR(intf->class_dev);
        }
 exit:
@@ -197,9 +182,8 @@ EXPORT_SYMBOL(usb_register_dev);
  * call to usb_register_dev() (usually when the device is disconnected
  * from the system.)
  *
- * This function also cleans up the devfs file for the usb device, if devfs
- * is enabled, and removes the usb class device from the sysfs tree.
- * 
+ * This function also removes the usb class device from the sysfs tree.
+ *
  * This should be called by all drivers that use the USB major number.
  */
 void usb_deregister_dev(struct usb_interface *intf,
@@ -222,7 +206,6 @@ void usb_deregister_dev(struct usb_interface *intf,
        spin_unlock (&minor_lock);
 
        snprintf(name, BUS_ID_SIZE, class_driver->name, intf->minor - minor_base);
-       devfs_remove (name);
        class_device_destroy(usb_class, MKDEV(USB_MAJOR, intf->minor));
        intf->class_dev = NULL;
        intf->minor = -1;