Commit cad58392 authored by Patrick Mochel's avatar Patrick Mochel

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().
parent b47b46a3
...@@ -62,16 +62,12 @@ static int generic_remove (struct device *dev) ...@@ -62,16 +62,12 @@ static int generic_remove (struct device *dev)
{ {
return 0; return 0;
} }
static void generic_release (struct device_driver * drv)
{
}
static struct device_driver usb_generic_driver = { static struct device_driver usb_generic_driver = {
.name = "usb", .name = "usb",
.bus = &usb_bus_type, .bus = &usb_bus_type,
.probe = generic_probe, .probe = generic_probe,
.remove = generic_remove, .remove = generic_remove,
.release = generic_release,
}; };
int usb_device_probe(struct device *dev) int usb_device_probe(struct device *dev)
...@@ -1427,7 +1423,7 @@ static void __exit usb_exit(void) ...@@ -1427,7 +1423,7 @@ static void __exit usb_exit(void)
usb_major_cleanup(); usb_major_cleanup();
usbfs_cleanup(); usbfs_cleanup();
usb_hub_cleanup(); usb_hub_cleanup();
put_bus(&usb_bus_type); bus_unregister(&usb_bus_type);
} }
subsys_initcall(usb_init); subsys_initcall(usb_init);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment