From 4601de807d7755aabd35faf5e15ae233241b8582 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 19 Apr 2013 11:50:10 -0700 Subject: [PATCH] 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 Cc: Joe Perches Signed-off-by: Greg Kroah-Hartman --- drivers/usb/storage/usb.c | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c index b4c63fcf7b0b..5c4fe0749af1 100644 --- a/drivers/usb/storage/usb.c +++ b/drivers/usb/storage/usb.c @@ -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, @@ -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); -- 2.30.2