From 69e9f4fd177b2e847b7fd6a3a041ce983d59b653 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 28 Feb 2012 13:12:00 -0800
Subject: [PATCH] --- yaml --- r: 289503 b: refs/heads/master c:
 11f79858ce0393b6b721f91cd8f69ec7c0192f9b h: refs/heads/master i:   289501:
 dbe18d9889196102a7cfa98f146c55a99ffd3144   289499:
 a5739ff5286bf938046009ec9dcbd118121bc60b   289495:
 03583f02f6646dc361777090b9ffbb6dfc093b6f   289487:
 d5be5569d4a58ceadceb6c47d2f512bf9141ddbc   289471:
 504d920ab60cbc9c1d9989bec575bc28109cc5fa v: v3

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

diff --git a/[refs] b/[refs]
index 9653bfaaa663..b4b1d0753196 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d40f5b0c0c6bc67fa35078501d097bf11f16483a
+refs/heads/master: 11f79858ce0393b6b721f91cd8f69ec7c0192f9b
diff --git a/trunk/drivers/usb/serial/kl5kusb105.c b/trunk/drivers/usb/serial/kl5kusb105.c
index 0e65e50edd50..10f05407e535 100644
--- a/trunk/drivers/usb/serial/kl5kusb105.c
+++ b/trunk/drivers/usb/serial/kl5kusb105.c
@@ -692,32 +692,11 @@ static int klsi_105_tiocmset(struct tty_struct *tty,
 	return retval;
 }
 
-
-static int __init klsi_105_init(void)
-{
-	int retval;
-
-	retval = usb_serial_register_drivers(&kl5kusb105d_driver,
-			serial_drivers);
-	if (retval == 0)
-		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
-			       DRIVER_DESC "\n");
-	return retval;
-}
-
-static void __exit klsi_105_exit(void)
-{
-	usb_serial_deregister_drivers(&kl5kusb105d_driver, serial_drivers);
-}
-
-
-module_init(klsi_105_init);
-module_exit(klsi_105_exit);
+module_usb_serial_driver(kl5kusb105d_driver, serial_drivers);
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_LICENSE("GPL");
 
-
 module_param(debug, bool, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(debug, "enable extensive debugging messages");