From 4235c50844a8dc36f99a1b591ed37b73a15bf643 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 19 Apr 2013 11:50:10 -0700
Subject: [PATCH] --- yaml --- r: 364881 b: refs/heads/master c:
 4601de807d7755aabd35faf5e15ae233241b8582 h: refs/heads/master i:   364879:
 05e1e39d936f9aa986a835ef634f95c9f48a5b87 v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/usb/storage/usb.c | 30 +-----------------------------
 2 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/[refs] b/[refs]
index 08a133254bcd..4e9a9bcd32a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 191648d03d20229523d9a75b8abef56421298d28
+refs/heads/master: 4601de807d7755aabd35faf5e15ae233241b8582
diff --git a/trunk/drivers/usb/storage/usb.c b/trunk/drivers/usb/storage/usb.c
index b4c63fcf7b0b..5c4fe0749af1 100644
--- a/trunk/drivers/usb/storage/usb.c
+++ b/trunk/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);