1 files changed, 2 insertions, 19 deletions

diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index 9a56635dc19c..112a7ae5095c 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -726,16 +726,6 @@ static int usb_uevent(struct device *dev, struct kobj_uevent_env *env)
                 return -ENODEV;
         }
 
-#ifdef  CONFIG_USB_DEVICEFS
-        /* If this is available, userspace programs can directly read
-         * all the device descriptors we don't tell them about.  Or
-         * act as usermode drivers.
-         */
-        if (add_uevent_var(env, "DEVICE=/proc/bus/usb/%03d/%03d",
-                           usb_dev->bus->busnum, usb_dev->devnum))
-                return -ENOMEM;
-#endif
-
         /* per-device configurations are common */
         if (add_uevent_var(env, "PRODUCT=%x/%x/%x",
                            le16_to_cpu(usb_dev->descriptor.idVendor),
@@ -788,15 +778,13 @@ int usb_register_device_driver(struct usb_device_driver *new_udriver,
 
         retval = driver_register(&new_udriver->drvwrap.driver);
 
-        if (!retval) {
+        if (!retval)
                 pr_info("%s: registered new device driver %s\n",
                         usbcore_name, new_udriver->name);
-                usbfs_update_special();
-        } else {
+        else
                 printk(KERN_ERR "%s: error %d registering device "
                         "       driver %s\n",
                         usbcore_name, retval, new_udriver->name);
-        }
 
         return retval;
 }
@@ -815,7 +803,6 @@ void usb_deregister_device_driver(struct usb_device_driver *udriver)
                         usbcore_name, udriver->name);
 
         driver_unregister(&udriver->drvwrap.driver);
-        usbfs_update_special();
 }
 EXPORT_SYMBOL_GPL(usb_deregister_device_driver);
 
@@ -856,8 +843,6 @@ int usb_register_driver(struct usb_driver *new_driver, struct module *owner,
         if (retval)
                 goto out;
 
-        usbfs_update_special();
-
         retval = usb_create_newid_files(new_driver);
         if (retval)
                 goto out_newid;
@@ -897,8 +882,6 @@ void usb_deregister(struct usb_driver *driver)
         usb_remove_newid_files(driver);
         driver_unregister(&driver->drvwrap.driver);
         usb_free_dynids(driver);
-
-        usbfs_update_special();
 }
 EXPORT_SYMBOL_GPL(usb_deregister);