1 files changed, 31 insertions, 41 deletions

diff --git a/drivers/usb/serial/ir-usb.c b/drivers/usb/serial/ir-usb.c
index 84965cd65c7..fc09414c960 100644
--- a/drivers/usb/serial/ir-usb.c
+++ b/drivers/usb/serial/ir-usb.c
@@ -77,13 +77,6 @@ static const struct usb_device_id ir_id_table[] = {
 
 MODULE_DEVICE_TABLE(usb, ir_id_table);
 
-static struct usb_driver ir_driver = {
-        .name           = "ir-usb",
-        .probe          = usb_serial_probe,
-        .disconnect     = usb_serial_disconnect,
-        .id_table       = ir_id_table,
-};
-
 static struct usb_serial_driver ir_device = {
         .driver = {
                 .owner  = THIS_MODULE,
@@ -103,18 +96,21 @@ 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)
+static inline void irda_usb_dump_class_desc(struct usb_serial *serial,
+                                            struct usb_irda_cs_descriptor *desc)
 {
-        dbg("bLength=%x", desc->bLength);
-        dbg("bDescriptorType=%x", desc->bDescriptorType);
-        dbg("bcdSpecRevision=%x", __le16_to_cpu(desc->bcdSpecRevision));
-        dbg("bmDataSize=%x", desc->bmDataSize);
-        dbg("bmWindowSize=%x", desc->bmWindowSize);
-        dbg("bmMinTurnaroundTime=%d", desc->bmMinTurnaroundTime);
-        dbg("wBaudRate=%x", __le16_to_cpu(desc->wBaudRate));
-        dbg("bmAdditionalBOFs=%x", desc->bmAdditionalBOFs);
-        dbg("bIrdaRateSniff=%x", desc->bIrdaRateSniff);
-        dbg("bMaxUnicastList=%x", desc->bMaxUnicastList);
+        struct device *dev = &serial->dev->dev;
+
+        dev_dbg(dev, "bLength=%x\n", desc->bLength);
+        dev_dbg(dev, "bDescriptorType=%x\n", desc->bDescriptorType);
+        dev_dbg(dev, "bcdSpecRevision=%x\n", __le16_to_cpu(desc->bcdSpecRevision));
+        dev_dbg(dev, "bmDataSize=%x\n", desc->bmDataSize);
+        dev_dbg(dev, "bmWindowSize=%x\n", desc->bmWindowSize);
+        dev_dbg(dev, "bmMinTurnaroundTime=%d\n", desc->bmMinTurnaroundTime);
+        dev_dbg(dev, "wBaudRate=%x\n", __le16_to_cpu(desc->wBaudRate));
+        dev_dbg(dev, "bmAdditionalBOFs=%x\n", desc->bmAdditionalBOFs);
+        dev_dbg(dev, "bIrdaRateSniff=%x\n", desc->bIrdaRateSniff);
+        dev_dbg(dev, "bMaxUnicastList=%x\n", desc->bMaxUnicastList);
 }
 
 /*------------------------------------------------------------------*/
@@ -130,8 +126,9 @@ static inline void irda_usb_dump_class_desc(struct usb_irda_cs_descriptor *desc)
  * Based on the same function in drivers/net/irda/irda-usb.c
  */
 static struct usb_irda_cs_descriptor *
-irda_usb_find_class_desc(struct usb_device *dev, unsigned int ifnum)
+irda_usb_find_class_desc(struct usb_serial *serial, unsigned int ifnum)
 {
+        struct usb_device *dev = serial->dev;
         struct usb_irda_cs_descriptor *desc;
         int ret;
 
@@ -144,20 +141,20 @@ irda_usb_find_class_desc(struct usb_device *dev, unsigned int ifnum)
                         USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
                         0, ifnum, desc, sizeof(*desc), 1000);
 
-        dbg("%s -  ret=%d", __func__, ret);
+        dev_dbg(&serial->dev->dev, "%s -  ret=%d\n", __func__, ret);
         if (ret < sizeof(*desc)) {
-                dbg("%s - class descriptor read %s (%d)",
-                                __func__,
-                                (ret < 0) ? "failed" : "too short",
-                                ret);
+                dev_dbg(&serial->dev->dev,
+                        "%s - class descriptor read %s (%d)\n", __func__,
+                        (ret < 0) ? "failed" : "too short", ret);
                 goto error;
         }
         if (desc->bDescriptorType != USB_DT_CS_IRDA) {
-                dbg("%s - bad class descriptor type", __func__);
+                dev_dbg(&serial->dev->dev, "%s - bad class descriptor type\n",
+                        __func__);
                 goto error;
         }
 
-        irda_usb_dump_class_desc(desc);
+        irda_usb_dump_class_desc(serial, desc);
         return desc;
 
 error:
@@ -207,14 +204,15 @@ static int ir_startup(struct usb_serial *serial)
 {
         struct usb_irda_cs_descriptor *irda_desc;
 
-        irda_desc = irda_usb_find_class_desc(serial->dev, 0);
+        irda_desc = irda_usb_find_class_desc(serial, 0);
         if (!irda_desc) {
                 dev_err(&serial->dev->dev,
                         "IRDA class descriptor not found, device not bound\n");
                 return -ENODEV;
         }
 
-        dbg("%s - Baud rates supported:%s%s%s%s%s%s%s%s%s",
+        dev_dbg(&serial->dev->dev,
+                "%s - Baud rates supported:%s%s%s%s%s%s%s%s%s\n",
                 __func__,
                 (irda_desc->wBaudRate & USB_IRDA_BR_2400) ? " 2400" : "",
                 (irda_desc->wBaudRate & USB_IRDA_BR_9600) ? " 9600" : "",
@@ -264,8 +262,6 @@ static int ir_open(struct tty_struct *tty, struct usb_serial_port *port)
 {
         int i;
 
-        dbg("%s - port %d", __func__, port->number);
-
         for (i = 0; i < ARRAY_SIZE(port->write_urbs); ++i)
                 port->write_urbs[i]->transfer_flags = URB_ZERO_PACKET;
 
@@ -322,15 +318,11 @@ static void ir_process_read_urb(struct urb *urb)
 
 static void ir_set_termios_callback(struct urb *urb)
 {
-        struct usb_serial_port *port = urb->context;
-        int status = urb->status;
-
-        dbg("%s - port %d", __func__, port->number);
-
         kfree(urb->transfer_buffer);
 
-        if (status)
-                dbg("%s - non-zero urb status: %d", __func__, status);
+        if (urb->status)
+                dev_dbg(&urb->dev->dev, "%s - non-zero urb status: %d\n",
+                        __func__, urb->status);
 }
 
 static void ir_set_termios(struct tty_struct *tty,
@@ -342,8 +334,6 @@ static void ir_set_termios(struct tty_struct *tty,
         speed_t baud;
         int ir_baud;
 
-        dbg("%s - port %d", __func__, port->number);
-
         baud = tty_get_baud_rate(tty);
 
         /*
@@ -447,7 +437,7 @@ static int __init ir_init(void)
                 ir_device.bulk_out_size = buffer_size;
         }
 
-        retval = usb_serial_register_drivers(&ir_driver, serial_drivers);
+        retval = usb_serial_register_drivers(serial_drivers, KBUILD_MODNAME, ir_id_table);
         if (retval == 0)
                 printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
                                DRIVER_DESC "\n");
@@ -456,7 +446,7 @@ static int __init ir_init(void)
 
 static void __exit ir_exit(void)
 {
-        usb_serial_deregister_drivers(&ir_driver, serial_drivers);
+        usb_serial_deregister_drivers(serial_drivers);
 }