---

yaml --- r: 289512 b: refs/heads/master c: 9334c4c h: refs/heads/master v: v3
git-mirror · Feb 28, 2012 · dd76333 · dd76333
1 parent cc9a1df
commit dd76333
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 20 deletions.
diff --git 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
@@ -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)