USB: minor driver model-related updates.

- don't define and use a release callback for the generic driver.

- Call bus_unregister() in usb_exit() to remove the usb driver, instead of put_bus().

diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index 8aa4fd0d80eac61e8dacc69dc2b6b00f90fab6ae..4c34d40f3c3f2af1685996438caed827924b6f9e 100644 (file)
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -62,16 +62,12 @@ static int generic_remove (struct device *dev)
 {
        return 0;
 }
-static void generic_release (struct device_driver * drv)
-{
-}
 
 static struct device_driver usb_generic_driver = {
        .name = "usb",
        .bus = &usb_bus_type,
        .probe = generic_probe,
        .remove = generic_remove,
-       .release = generic_release,
 };
        
 int usb_device_probe(struct device *dev)
@@ -1427,7 +1423,7 @@ static void __exit usb_exit(void)
        usb_major_cleanup();
        usbfs_cleanup();
        usb_hub_cleanup();
-       put_bus(&usb_bus_type);
+       bus_unregister(&usb_bus_type);
 }
 
 subsys_initcall(usb_init);