From 21ad9bf81c3392d3b0c261fcbebe38e944445351 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 28 Feb 2012 13:11:40 -0800
Subject: [PATCH] --- yaml --- r: 289490 b: refs/heads/master c:
 5671df5c1c6ee664ebc66a5be60a282afee8d340 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index e643cf832378..1f3c48fc5d76 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 274f3b1e82c899fd1b39822c2ee39bbac52f3d3c
+refs/heads/master: 5671df5c1c6ee664ebc66a5be60a282afee8d340
diff --git a/trunk/drivers/usb/serial/cyberjack.c b/trunk/drivers/usb/serial/cyberjack.c
index d2e536f649ba..d39b9418f2fb 100644
--- a/trunk/drivers/usb/serial/cyberjack.c
+++ b/trunk/drivers/usb/serial/cyberjack.c
@@ -475,26 +475,7 @@ static void cyberjack_write_bulk_callback(struct urb *urb)
 	usb_serial_port_softint(port);
 }
 
-static int __init cyberjack_init(void)
-{
-	int retval;
-
-	retval = usb_serial_register_drivers(&cyberjack_driver, serial_drivers);
-	if (retval == 0) {
-		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION " "
-			       DRIVER_AUTHOR "\n");
-		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n");
-	}
-	return retval;
-}
-
-static void __exit cyberjack_exit(void)
-{
-	usb_serial_deregister_drivers(&cyberjack_driver, serial_drivers);
-}
-
-module_init(cyberjack_init);
-module_exit(cyberjack_exit);
+module_usb_serial_driver(cyberjack_driver, serial_drivers);
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);