From e2ab4d5f9f86cdc1e71bce4e945c6249aeec9fcf Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 8 Mar 2012 13:33:04 -0800
Subject: [PATCH] --- yaml --- r: 289659 b: refs/heads/master c:
 11a4f40064f38dcc369d716bea2020f6b5e290ff h: refs/heads/master i:   289657:
 b87d7378eba0685317a5d613247443a443596a31   289655:
 7ac3a97a5533506c7a4d69b0e48f308486e4db7d v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/usb/serial/metro-usb.c | 18 +++++++-----------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index cf4b54050747..1decdb5a35dd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43d186fe992da93bb1dd34a7dd4534719624431c
+refs/heads/master: 11a4f40064f38dcc369d716bea2020f6b5e290ff
diff --git a/trunk/drivers/usb/serial/metro-usb.c b/trunk/drivers/usb/serial/metro-usb.c
index 5b8ed50e5dda..bb6838959876 100644
--- a/trunk/drivers/usb/serial/metro-usb.c
+++ b/trunk/drivers/usb/serial/metro-usb.c
@@ -92,7 +92,6 @@ static struct usb_serial_driver metrousb_device = {
 	},
 	.description 		= "Metrologic USB to serial converter.",
 	.id_table 		= id_table,
-	.usb_driver		= &metrousb_driver,
 	.num_ports 		= 1,
 	.open 			= metrousb_open,
 	.close 			= metrousb_close,
@@ -105,6 +104,11 @@ static struct usb_serial_driver metrousb_device = {
 	.tiocmset          	= metrousb_tiocmset,
 };
 
+static struct usb_serial_driver * const serial_drivers[] = {
+	&metrousb_device,
+	NULL,
+};
+
 /* ----------------------------------------------------------------------------------------------
   Description:
 	Clean up any urbs and port information.
@@ -163,10 +167,7 @@ static void metrousb_close (struct usb_serial_port *port)
 */
 static void __exit metrousb_exit(void)
 {
-	dbg("METRO-USB - %s", __FUNCTION__);
-
-	usb_deregister(&metrousb_driver);
-	usb_serial_deregister(&metrousb_device);
+	usb_serial_deregister_drivers(&metrousb_driver, serial_drivers);
 }
 
 /* ----------------------------------------------------------------------------------------------
@@ -203,15 +204,10 @@ static int __init metrousb_init(void)
 	}
 
 	/* Register the devices. */
-	retval = usb_serial_register(&metrousb_device);
+	retval = usb_serial_register_drivers(&metrousb_driver, serial_drivers);
 	if (retval)
 		return retval;
 
-	/* Register the driver. */
-	retval = usb_register(&metrousb_driver);
-	if (retval)
-		usb_serial_deregister(&metrousb_device);
-
 	printk(KERN_INFO DRIVER_DESC " : " DRIVER_VERSION);
 
 	return retval;