Skip to content

Commit

Permalink
USB: storage: convert to use module_usb_driver()
Browse files Browse the repository at this point in the history
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 <[email protected]>
Cc: Joe Perches <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
  • Loading branch information
gregkh committed Apr 19, 2013
1 parent 191648d commit 4601de8
Showing 1 changed file with 1 addition and 29 deletions.
30 changes: 1 addition & 29 deletions drivers/usb/storage/usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -1071,10 +1071,6 @@ static int storage_probe(struct usb_interface *intf,
return result;
}

/***********************************************************************
* Initialization and registration
***********************************************************************/

static struct usb_driver usb_storage_driver = {
.name = "usb-storage",
.probe = storage_probe,
Expand All @@ -1089,28 +1085,4 @@ static struct usb_driver usb_storage_driver = {
.soft_unbind = 1,
};

static int __init usb_stor_init(void)
{
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);
module_usb_driver(usb_storage_driver);

0 comments on commit 4601de8

Please sign in to comment.