---

yaml --- r: 289490 b: refs/heads/master c: 5671df5 h: refs/heads/master v: v3
git-mirror · Feb 28, 2012 · 21ad9bf · 21ad9bf
1 parent 6b977f8
commit 21ad9bf
Show file tree

Hide file tree

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