From 3be0b4cce8bf52e1fefcbf9ffacfab2de0ff858b Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 28 Feb 2012 13:12:31 -0800
Subject: [PATCH] --- yaml --- r: 289517 b: refs/heads/master c:
 c9d521747872ecb77ba39bb9a8162449cd74d343 h: refs/heads/master i:   289515:
 642b022c81ec6a647f5602eabf27c1851c652d2a v: v3

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

diff --git a/[refs] b/[refs]
index b0d3d5736cc8..854b48d2be5d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4264af2c59e287153e99c7b4e7516086366d272
+refs/heads/master: c9d521747872ecb77ba39bb9a8162449cd74d343
diff --git a/trunk/drivers/usb/serial/sierra.c b/trunk/drivers/usb/serial/sierra.c
index d75a75b83e9f..f14465a83dd1 100644
--- a/trunk/drivers/usb/serial/sierra.c
+++ b/trunk/drivers/usb/serial/sierra.c
@@ -1115,25 +1115,7 @@ static struct usb_serial_driver * const serial_drivers[] = {
 	&sierra_device, NULL
 };
 
-/* Functions used by new usb-serial code. */
-static int __init sierra_init(void)
-{
-	int retval;
-
-	retval = usb_serial_register_drivers(&sierra_driver, serial_drivers);
-	if (retval == 0)
-		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
-			       DRIVER_DESC "\n");
-	return retval;
-}
-
-static void __exit sierra_exit(void)
-{
-	usb_serial_deregister_drivers(&sierra_driver, serial_drivers);
-}
-
-module_init(sierra_init);
-module_exit(sierra_exit);
+module_usb_serial_driver(sierra_driver, serial_drivers);
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);