Skip to content

Commit

Permalink
USB: serial: option.c: remove dbg() usage
Browse files Browse the repository at this point in the history
dbg() was a very old USB-serial-specific macro.
This patch removes it from being used in the
driver and uses dev_dbg() instead.

CC: Matthias Urlichs <smurf@smurf.noris.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Greg Kroah-Hartman committed Sep 14, 2012
1 parent d44d9ab commit 0e00609
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions drivers/usb/serial/option.c
Original file line number Diff line number Diff line change
Expand Up @@ -1367,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) &&
Expand All @@ -1388,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;
Expand All @@ -1404,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);
}
}
Expand Down

0 comments on commit 0e00609

Please sign in to comment.