usb-serial: use new registration API in [i-j]* drivers

This patch (as1525) modifies the following usb-serial drivers to
utilize the new usb_serial_{de}register_drivers() routines:

	io_edgeport, io_ti, ipaq, ipw, ir-usb, and iuu_phoenix.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 9 insertions, 21 deletions

diff --git a/drivers/usb/serial/ir-usb.c b/drivers/usb/serial/ir-usb.c
index 84a396e83671..84965cd65c76 100644
--- a/drivers/usb/serial/ir-usb.c
+++ b/drivers/usb/serial/ir-usb.c
@@ -82,7 +82,6 @@ static struct usb_driver ir_driver = {
         .probe          = usb_serial_probe,
         .disconnect     = usb_serial_disconnect,
         .id_table       = ir_id_table,
-        .no_dynamic_id  = 1,
 };
 
 static struct usb_serial_driver ir_device = {
@@ -91,7 +90,6 @@ static struct usb_serial_driver ir_device = {
                 .name   = "ir-usb",
         },
         .description            = "IR Dongle",
-        .usb_driver             = &ir_driver,
         .id_table               = ir_id_table,
         .num_ports              = 1,
         .set_termios            = ir_set_termios,
@@ -101,6 +99,10 @@ static struct usb_serial_driver ir_device = {
         .process_read_urb       = ir_process_read_urb,
 };
 
+static struct usb_serial_driver * const serial_drivers[] = {
+        &ir_device, NULL
+};
+
 static inline void irda_usb_dump_class_desc(struct usb_irda_cs_descriptor *desc)
 {
         dbg("bLength=%x", desc->bLength);
@@ -445,30 +447,16 @@ static int __init ir_init(void)
                 ir_device.bulk_out_size = buffer_size;
         }
 
-        retval = usb_serial_register(&ir_device);
-        if (retval)
-                goto failed_usb_serial_register;
-
-        retval = usb_register(&ir_driver);
-        if (retval)
-                goto failed_usb_register;
-
-        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
-               DRIVER_DESC "\n");
-
-        return 0;
-
-failed_usb_register:
-        usb_serial_deregister(&ir_device);
-
-failed_usb_serial_register:
+        retval = usb_serial_register_drivers(&ir_driver, serial_drivers);
+        if (retval == 0)
+                printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+                               DRIVER_DESC "\n");
         return retval;
 }
 
 static void __exit ir_exit(void)
 {
-        usb_deregister(&ir_driver);
-        usb_serial_deregister(&ir_device);
+        usb_serial_deregister_drivers(&ir_driver, serial_drivers);
 }