From dd763338ae70d72d6f21f2f76277d462b7011c21 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 28 Feb 2012 13:12:19 -0800
Subject: [PATCH] --- yaml --- r: 289512 b: refs/heads/master c:
 9334c4c16e6fa80dc55865897337b49c1753f33b h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 33bb399b706b..7695f75f30b4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e206b7f831da365a38b22f72ba42db288db71c65
+refs/heads/master: 9334c4c16e6fa80dc55865897337b49c1753f33b
diff --git a/trunk/drivers/usb/serial/option.c b/trunk/drivers/usb/serial/option.c
index ab5047944d1d..005511b2ee08 100644
--- a/trunk/drivers/usb/serial/option.c
+++ b/trunk/drivers/usb/serial/option.c
@@ -1289,25 +1289,7 @@ struct option_port_private {
 	unsigned long tx_start_time[N_OUT_URB];
 };
 
-/* Functions used by new usb-serial code. */
-static int __init option_init(void)
-{
-	int retval;
-
-	retval = usb_serial_register_drivers(&option_driver, serial_drivers);
-	if (retval == 0)
-		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
-			       DRIVER_DESC "\n");
-	return retval;
-}
-
-static void __exit option_exit(void)
-{
-	usb_serial_deregister_drivers(&option_driver, serial_drivers);
-}
-
-module_init(option_init);
-module_exit(option_exit);
+module_usb_serial_driver(option_driver, serial_drivers);
 
 static bool is_blacklisted(const u8 ifnum, enum option_blacklist_reason reason,
 			   const struct option_blacklist_info *blacklist)