From a5739ff5286bf938046009ec9dcbd118121bc60b Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 28 Feb 2012 13:11:56 -0800
Subject: [PATCH] --- yaml --- r: 289499 b: refs/heads/master c:
 f939484bb6473e51c1516ab9a4f3a7620cd95d72 h: refs/heads/master i:   289497:
 b3b616adb03fe098e66d22e49f16c9ccfab17475   289495:
 03583f02f6646dc361777090b9ffbb6dfc093b6f v: v3

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

diff --git a/[refs] b/[refs]
index 70a6c42a1f9a..1b504f058c13 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8485f8c9652b226726827e61fb43647bf22e691f
+refs/heads/master: f939484bb6473e51c1516ab9a4f3a7620cd95d72
diff --git a/trunk/drivers/usb/serial/ipw.c b/trunk/drivers/usb/serial/ipw.c
index 27b8886f1055..76a06406e26a 100644
--- a/trunk/drivers/usb/serial/ipw.c
+++ b/trunk/drivers/usb/serial/ipw.c
@@ -333,25 +333,7 @@ static struct usb_serial_driver * const serial_drivers[] = {
 	&ipw_device, NULL
 };
 
-
-static int __init usb_ipw_init(void)
-{
-	int retval;
-
-	retval = usb_serial_register_drivers(&usb_ipw_driver, serial_drivers);
-	if (retval == 0)
-		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
-			       DRIVER_DESC "\n");
-	return retval;
-}
-
-static void __exit usb_ipw_exit(void)
-{
-	usb_serial_deregister_drivers(&usb_ipw_driver, serial_drivers);
-}
-
-module_init(usb_ipw_init);
-module_exit(usb_ipw_exit);
+module_usb_serial_driver(usb_ipw_driver, serial_drivers);
 
 /* Module information */
 MODULE_AUTHOR(DRIVER_AUTHOR);