Merge 3.6-rc6 into usb-next

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / drivers / usb / serial / option.c

diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 5ce88d1..53bd5f4 100644 (file)
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -1257,8 +1257,6 @@ static struct usb_serial_driver * const serial_drivers[] = {
        &option_1port_device, NULL
 };
 
-static bool debug;
-
 struct option_private {
        u8 bInterfaceNumber;
 };
@@ -1369,18 +1367,19 @@ static void option_instat_callback(struct urb *urb)
 {
        int err;
        int status = urb->status;
-       struct usb_serial_port *port =  urb->context;
+       struct usb_serial_port *port = urb->context;
+       struct device *dev = &port->dev;
        struct usb_wwan_port_private *portdata =
                                        usb_get_serial_port_data(port);
 
-       dbg("%s: urb %p port %p has data %p", __func__, urb, port, portdata);
+       dev_dbg(dev, "%s: urb %p port %p has data %p\n", __func__, urb, port, portdata);
 
        if (status == 0) {
                struct usb_ctrlrequest *req_pkt =
                                (struct usb_ctrlrequest *)urb->transfer_buffer;
 
                if (!req_pkt) {
-                       dbg("%s: NULL req_pkt", __func__);
+                       dev_dbg(dev, "%s: NULL req_pkt\n", __func__);
                        return;
                }
                if ((req_pkt->bRequestType == 0xA1) &&
@@ -1390,7 +1389,7 @@ static void option_instat_callback(struct urb *urb)
                                        urb->transfer_buffer +
                                        sizeof(struct usb_ctrlrequest));
 
-                       dbg("%s: signal x%x", __func__, signals);
+                       dev_dbg(dev, "%s: signal x%x\n", __func__, signals);
 
                        old_dcd_state = portdata->dcd_state;
                        portdata->cts_state = 1;
@@ -1406,17 +1405,17 @@ static void option_instat_callback(struct urb *urb)
                                tty_kref_put(tty);
                        }
                } else {
-                       dbg("%s: type %x req %x", __func__,
+                       dev_dbg(dev, "%s: type %x req %x\n", __func__,
                                req_pkt->bRequestType, req_pkt->bRequest);
                }
        } else
-               dev_err(&port->dev, "%s: error %d\n", __func__, status);
+               dev_err(dev, "%s: error %d\n", __func__, status);
 
        /* Resubmit urb so we continue receiving IRQ data */
        if (status != -ESHUTDOWN && status != -ENOENT) {
                err = usb_submit_urb(urb, GFP_ATOMIC);
                if (err)
-                       dbg("%s: resubmit intr urb failed. (%d)",
+                       dev_dbg(dev, "%s: resubmit intr urb failed. (%d)\n",
                                __func__, err);
        }
 }
@@ -1450,6 +1449,3 @@ MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_VERSION(DRIVER_VERSION);
 MODULE_LICENSE("GPL");
-
-module_param(debug, bool, S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(debug, "Debug messages");