From cc9a1df389990b8ff648ed78455ee632c6fe7286 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: 289511 b: refs/heads/master c:
 e206b7f831da365a38b22f72ba42db288db71c65 h: refs/heads/master i:   289509:
 8496201d752bd0b8f50903c2f73f3d976615c64c   289507:
 34a268cde1da100add31364dfb7e173585aec9dc   289503:
 69e9f4fd177b2e847b7fd6a3a041ce983d59b653 v: v3

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

diff --git a/[refs] b/[refs]
index f3de2045c365..33bb399b706b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6384eaefd337b465417e9b64ebf74717703c0788
+refs/heads/master: e206b7f831da365a38b22f72ba42db288db71c65
diff --git a/trunk/drivers/usb/serial/opticon.c b/trunk/drivers/usb/serial/opticon.c
index 7001ad779b94..82cc9d202b83 100644
--- a/trunk/drivers/usb/serial/opticon.c
+++ b/trunk/drivers/usb/serial/opticon.c
@@ -631,18 +631,8 @@ static struct usb_serial_driver * const serial_drivers[] = {
 	&opticon_device, NULL
 };
 
-static int __init opticon_init(void)
-{
-	return usb_serial_register_drivers(&opticon_driver, serial_drivers);
-}
-
-static void __exit opticon_exit(void)
-{
-	usb_serial_deregister_drivers(&opticon_driver, serial_drivers);
-}
+module_usb_serial_driver(opticon_driver, serial_drivers);
 
-module_init(opticon_init);
-module_exit(opticon_exit);
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_LICENSE("GPL");