Commit 4601de80 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

USB: storage: convert to use module_usb_driver()



Now that Joe cleaned up the init/exit functions, we can just get rid of
them entirely and use the proper macro that almost all other USB drivers
now use.

Cc: Matthew Dharm <mdharm-usb@one-eyed-alien.net>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 191648d0
...@@ -1071,10 +1071,6 @@ static int storage_probe(struct usb_interface *intf, ...@@ -1071,10 +1071,6 @@ static int storage_probe(struct usb_interface *intf,
return result; return result;
} }
/***********************************************************************
* Initialization and registration
***********************************************************************/
static struct usb_driver usb_storage_driver = { static struct usb_driver usb_storage_driver = {
.name = "usb-storage", .name = "usb-storage",
.probe = storage_probe, .probe = storage_probe,
...@@ -1089,28 +1085,4 @@ static struct usb_driver usb_storage_driver = { ...@@ -1089,28 +1085,4 @@ static struct usb_driver usb_storage_driver = {
.soft_unbind = 1, .soft_unbind = 1,
}; };
static int __init usb_stor_init(void) module_usb_driver(usb_storage_driver);
{
int retval;
pr_info("Initializing USB Mass Storage driver...\n");
/* register the driver, return usb_register return code if error */
retval = usb_register(&usb_storage_driver);
if (retval == 0)
pr_info("USB Mass Storage support registered\n");
return retval;
}
static void __exit usb_stor_exit(void)
{
/* Deregister the driver
* This will cause disconnect() to be called for each
* attached unit
*/
pr_info("Deregistering USB Mass Storage driver...\n");
usb_deregister(&usb_storage_driver);
}
module_init(usb_stor_init);
module_exit(usb_stor_exit);
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