1 files changed, 6 insertions, 38 deletions

diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c
index 5818bfc3261e..40a95a7fe383 100644
--- a/drivers/usb/serial/io_ti.c
+++ b/drivers/usb/serial/io_ti.c
@@ -202,7 +202,6 @@ static struct usb_driver io_driver = {
         .probe =        usb_serial_probe,
         .disconnect =   usb_serial_disconnect,
         .id_table =     id_table_combined,
-        .no_dynamic_id =        1,
 };
 
 
@@ -1817,7 +1816,7 @@ static void edge_bulk_out_callback(struct urb *urb)
                     __func__, status);
                 return;
         default:
-                dev_err(&urb->dev->dev, "%s - nonzero write bulk status "
+                dev_err_console(port, "%s - nonzero write bulk status "
                         "received: %d\n", __func__, status);
         }
 
@@ -2111,7 +2110,7 @@ static void edge_send(struct tty_struct *tty)
         /* send the data out the bulk port */
         result = usb_submit_urb(port->write_urb, GFP_ATOMIC);
         if (result) {
-                dev_err(&port->dev,
+                dev_err_console(port,
                         "%s - failed submitting write urb, error %d\n",
                                 __func__, result);
                 edge_port->ep_write_urb_in_use = 0;
@@ -2725,7 +2724,6 @@ static struct usb_serial_driver edgeport_1port_device = {
                 .name           = "edgeport_ti_1",
         },
         .description            = "Edgeport TI 1 port adapter",
-        .usb_driver             = &io_driver,
         .id_table               = edgeport_1port_id_table,
         .num_ports              = 1,
         .open                   = edge_open,
@@ -2757,7 +2755,6 @@ static struct usb_serial_driver edgeport_2port_device = {
                 .name           = "edgeport_ti_2",
         },
         .description            = "Edgeport TI 2 port adapter",
-        .usb_driver             = &io_driver,
         .id_table               = edgeport_2port_id_table,
         .num_ports              = 2,
         .open                   = edge_open,
@@ -2782,41 +2779,12 @@ static struct usb_serial_driver edgeport_2port_device = {
         .write_bulk_callback    = edge_bulk_out_callback,
 };
 
+static struct usb_serial_driver * const serial_drivers[] = {
+        &edgeport_1port_device, &edgeport_2port_device, NULL
+};
 
-static int __init edgeport_init(void)
-{
-        int retval;
-        retval = usb_serial_register(&edgeport_1port_device);
-        if (retval)
-                goto failed_1port_device_register;
-        retval = usb_serial_register(&edgeport_2port_device);
-        if (retval)
-                goto failed_2port_device_register;
-        retval = usb_register(&io_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(&edgeport_2port_device);
-failed_2port_device_register:
-        usb_serial_deregister(&edgeport_1port_device);
-failed_1port_device_register:
-        return retval;
-}
-
-static void __exit edgeport_exit(void)
-{
-        usb_deregister(&io_driver);
-        usb_serial_deregister(&edgeport_1port_device);
-        usb_serial_deregister(&edgeport_2port_device);
-}
-
-module_init(edgeport_init);
-module_exit(edgeport_exit);
+module_usb_serial_driver(io_driver, serial_drivers);
 
-/* Module information */
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_LICENSE("GPL");