1 files changed, 8 insertions, 28 deletions

diff --git a/drivers/usb/serial/oti6858.c b/drivers/usb/serial/oti6858.c
index e287fd32682c..5fdc33c6a3c0 100644
--- a/drivers/usb/serial/oti6858.c
+++ b/drivers/usb/serial/oti6858.c
@@ -71,7 +71,6 @@ static struct usb_driver oti6858_driver = {
         .probe =        usb_serial_probe,
         .disconnect =   usb_serial_disconnect,
         .id_table =     id_table,
-        .no_dynamic_id =        1,
 };
 
 static bool debug;
@@ -157,7 +156,6 @@ static struct usb_serial_driver oti6858_device = {
                 .name =         "oti6858",
         },
         .id_table =             id_table,
-        .usb_driver =           &oti6858_driver,
         .num_ports =            1,
         .open =                 oti6858_open,
         .close =                oti6858_close,
@@ -176,6 +174,10 @@ static struct usb_serial_driver oti6858_device = {
         .release =              oti6858_release,
 };
 
+static struct usb_serial_driver * const serial_drivers[] = {
+        &oti6858_device, NULL
+};
+
 struct oti6858_private {
         spinlock_t lock;
 
@@ -302,7 +304,7 @@ static void send_data(struct work_struct *work)
         if (count != 0) {
                 allow = kmalloc(1, GFP_KERNEL);
                 if (!allow) {
-                        dev_err(&port->dev, "%s(): kmalloc failed\n",
+                        dev_err_console(port, "%s(): kmalloc failed\n",
                                         __func__);
                         return;
                 }
@@ -334,7 +336,7 @@ static void send_data(struct work_struct *work)
         port->write_urb->transfer_buffer_length = count;
         result = usb_submit_urb(port->write_urb, GFP_NOIO);
         if (result != 0) {
-                dev_err(&port->dev, "%s(): usb_submit_urb() failed"
+                dev_err_console(port, "%s(): usb_submit_urb() failed"
                                " with error %d\n", __func__, result);
                 priv->flags.write_urb_in_use = 0;
         }
@@ -938,7 +940,7 @@ static void oti6858_write_bulk_callback(struct urb *urb)
                 port->write_urb->transfer_buffer_length = 1;
                 result = usb_submit_urb(port->write_urb, GFP_ATOMIC);
                 if (result) {
-                        dev_err(&port->dev, "%s(): usb_submit_urb() failed,"
+                        dev_err_console(port, "%s(): usb_submit_urb() failed,"
                                         " error %d\n", __func__, result);
                 } else {
                         return;
@@ -956,29 +958,7 @@ static void oti6858_write_bulk_callback(struct urb *urb)
         }
 }
 
-/* module description and (de)initialization */
-
-static int __init oti6858_init(void)
-{
-        int retval;
-
-        retval = usb_serial_register(&oti6858_device);
-        if (retval == 0) {
-                retval = usb_register(&oti6858_driver);
-                if (retval)
-                        usb_serial_deregister(&oti6858_device);
-        }
-        return retval;
-}
-
-static void __exit oti6858_exit(void)
-{
-        usb_deregister(&oti6858_driver);
-        usb_serial_deregister(&oti6858_device);
-}
-
-module_init(oti6858_init);
-module_exit(oti6858_exit);
+module_usb_serial_driver(oti6858_driver, serial_drivers);
 
 MODULE_DESCRIPTION(OTI6858_DESCRIPTION);
 MODULE_AUTHOR(OTI6858_AUTHOR);