Skip to content

Commit

Permalink
USB Serial: Sierra: debug message fix
Browse files Browse the repository at this point in the history 
This patch moves dbg calls to dev_dbg where possible. It also fixes some
issues with a previous submission aiming to do the same thing.

Signed-off-by: Kevin Lloyd <klloyd@sierrawireless.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Kevin Lloyd authored and Greg Kroah-Hartman committed Oct 17, 2008
1 parent 399d31d commit 7384a92
Showing 1 changed file with 38 additions and 31 deletions.
69 changes: 38 additions & 31 deletions drivers/usb/serial/sierra.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ static int sierra_send_setup(struct tty_struct *tty,
struct sierra_port_private *portdata;
__u16 interface = 0;

dbg("%s", __func__);
dev_dbg(&port->dev, "%s", __func__);

portdata = usb_get_serial_port_data(port);

Expand Down Expand Up @@ -284,7 +284,7 @@ static int sierra_send_setup(struct tty_struct *tty,
static void sierra_set_termios(struct tty_struct *tty,
struct usb_serial_port *port, struct ktermios *old_termios)
{
dbg("%s", __func__);
dev_dbg(&port->dev, "%s", __func__);
tty_termios_copy_hw(tty->termios, old_termios);
sierra_send_setup(tty, port);
}
Expand All @@ -295,6 +295,7 @@ static int sierra_tiocmget(struct tty_struct *tty, struct file *file)
unsigned int value;
struct sierra_port_private *portdata;

dev_dbg(&port->dev, "%s", __func__);
portdata = usb_get_serial_port_data(port);

value = ((portdata->rts_state) ? TIOCM_RTS : 0) |
Expand Down Expand Up @@ -334,14 +335,14 @@ static void sierra_outdat_callback(struct urb *urb)
int status = urb->status;
unsigned long flags;

dbg("%s - port %d", __func__, port->number);
dev_dbg(&port->dev, "%s - port %d", __func__, port->number);

/* free up the transfer buffer, as usb_free_urb() does not do this */
kfree(urb->transfer_buffer);

if (status)
dbg("%s - nonzero write bulk status received: %d",
__func__, status);
dev_dbg(&port->dev, "%s - nonzero write bulk status "
"received: %d", __func__, status);

spin_lock_irqsave(&portdata->lock, flags);
--portdata->outstanding_urbs;
Expand All @@ -363,12 +364,12 @@ static int sierra_write(struct tty_struct *tty, struct usb_serial_port *port,

portdata = usb_get_serial_port_data(port);

dbg("%s: write (%d chars)", __func__, count);
dev_dbg(&port->dev, "%s: write (%d chars)", __func__, count);

spin_lock_irqsave(&portdata->lock, flags);
if (portdata->outstanding_urbs > N_OUT_URB) {
spin_unlock_irqrestore(&portdata->lock, flags);
dbg("%s - write limit hit\n", __func__);
dev_dbg(&port->dev, "%s - write limit hit\n", __func__);
return 0;
}
portdata->outstanding_urbs++;
Expand Down Expand Up @@ -437,8 +438,8 @@ static void sierra_indat_callback(struct urb *urb)
port = urb->context;

if (status) {
dbg("%s: nonzero status: %d on endpoint %02x.",
__func__, status, endpoint);
dev_dbg(&port->dev, "%s: nonzero status: %d on"
" endpoint %02x.", __func__, status, endpoint);
} else {
if (urb->actual_length) {
tty = tty_port_tty_get(&port->port);
Expand All @@ -447,7 +448,8 @@ static void sierra_indat_callback(struct urb *urb)
tty_flip_buffer_push(tty);
tty_kref_put(tty);
} else
dbg("%s: empty read urb received", __func__);
dev_dbg(&port->dev, "%s: empty read urb"
" received", __func__);

/* Resubmit urb so we continue receiving */
if (port->port.count && status != -ESHUTDOWN) {
Expand All @@ -468,15 +470,17 @@ static void sierra_instat_callback(struct urb *urb)
struct sierra_port_private *portdata = usb_get_serial_port_data(port);
struct usb_serial *serial = port->serial;

dbg("%s", __func__);
dbg("%s: urb %p port %p has data %p", __func__, urb, port, portdata);
dev_dbg(&port->dev, "%s", __func__);
dev_dbg(&port->dev, "%s: urb %p port %p has data %p", __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\n", __func__);
dev_dbg(&port->dev, "%s: NULL req_pkt\n",
__func__);
return;
}
if ((req_pkt->bRequestType == 0xA1) &&
Expand All @@ -487,7 +491,8 @@ static void sierra_instat_callback(struct urb *urb)
sizeof(struct usb_ctrlrequest));
struct tty_struct *tty;

dbg("%s: signal x%x", __func__, signals);
dev_dbg(&port->dev, "%s: signal x%x", __func__,
signals);

old_dcd_state = portdata->dcd_state;
portdata->cts_state = 1;
Expand All @@ -501,19 +506,20 @@ static void sierra_instat_callback(struct urb *urb)
tty_hangup(tty);
tty_kref_put(tty);
} else {
dbg("%s: type %x req %x", __func__,
req_pkt->bRequestType, req_pkt->bRequest);
dev_dbg(&port->dev, "%s: type %x req %x",
__func__, req_pkt->bRequestType,
req_pkt->bRequest);
}
} else
dbg("%s: error %d", __func__, status);
dev_dbg(&port->dev, "%s: error %d", __func__, status);

/* Resubmit urb so we continue receiving IRQ data */
if (status != -ESHUTDOWN) {
urb->dev = serial->dev;
err = usb_submit_urb(urb, GFP_ATOMIC);
if (err)
dbg("%s: resubmit intr urb failed. (%d)",
__func__, err);
dev_dbg(&port->dev, "%s: resubmit intr urb "
"failed. (%d)", __func__, err);
}
}

Expand All @@ -523,14 +529,14 @@ static int sierra_write_room(struct tty_struct *tty)
struct sierra_port_private *portdata = usb_get_serial_port_data(port);
unsigned long flags;

dbg("%s - port %d", __func__, port->number);
dev_dbg(&port->dev, "%s - port %d", __func__, port->number);

/* try to give a good number back based on if we have any free urbs at
* this point in time */
spin_lock_irqsave(&portdata->lock, flags);
if (portdata->outstanding_urbs > N_OUT_URB * 2 / 3) {
spin_unlock_irqrestore(&portdata->lock, flags);
dbg("%s - write limit hit\n", __func__);
dev_dbg(&port->dev, "%s - write limit hit\n", __func__);
return 0;
}
spin_unlock_irqrestore(&portdata->lock, flags);
Expand All @@ -549,7 +555,7 @@ static int sierra_open(struct tty_struct *tty,

portdata = usb_get_serial_port_data(port);

dbg("%s", __func__);
dev_dbg(&port->dev, "%s", __func__);

/* Set some sane defaults */
portdata->rts_state = 1;
Expand All @@ -561,8 +567,8 @@ static int sierra_open(struct tty_struct *tty,
if (!urb)
continue;
if (urb->dev != serial->dev) {
dbg("%s: dev %p != %p", __func__,
urb->dev, serial->dev);
dev_dbg(&port->dev, "%s: dev %p != %p",
__func__, urb->dev, serial->dev);
continue;
}

Expand Down Expand Up @@ -601,7 +607,7 @@ static void sierra_close(struct tty_struct *tty,
struct usb_serial *serial = port->serial;
struct sierra_port_private *portdata;

dbg("%s", __func__);
dev_dbg(&port->dev, "%s", __func__);
portdata = usb_get_serial_port_data(port);

portdata->rts_state = 0;
Expand Down Expand Up @@ -630,7 +636,7 @@ static int sierra_startup(struct usb_serial *serial)
int i;
int j;

dbg("%s", __func__);
dev_dbg(&serial->dev->dev, "%s", __func__);

/* Set Device mode to D0 */
sierra_set_power_state(serial->dev, 0x0000);
Expand All @@ -644,8 +650,9 @@ static int sierra_startup(struct usb_serial *serial)
port = serial->port[i];
portdata = kzalloc(sizeof(*portdata), GFP_KERNEL);
if (!portdata) {
dbg("%s: kmalloc for sierra_port_private (%d) failed!.",
__func__, i);
dev_dbg(&port->dev, "%s: kmalloc for "
"sierra_port_private (%d) failed!.",
__func__, i);
return -ENOMEM;
}
spin_lock_init(&portdata->lock);
Expand All @@ -665,8 +672,8 @@ static int sierra_startup(struct usb_serial *serial)
for (j = 0; j < N_IN_URB; ++j) {
urb = usb_alloc_urb(0, GFP_KERNEL);
if (urb == NULL) {
dbg("%s: alloc for in port failed.",
__func__);
dev_dbg(&port->dev, "%s: alloc for in "
"port failed.", __func__);
continue;
}
/* Fill URB using supplied data. */
Expand All @@ -688,7 +695,7 @@ static void sierra_shutdown(struct usb_serial *serial)
struct usb_serial_port *port;
struct sierra_port_private *portdata;

dbg("%s", __func__);
dev_dbg(&serial->dev->dev, "%s", __func__);

for (i = 0; i < serial->num_ports; ++i) {
port = serial->port[i];
Expand Down

0 comments on commit 7384a92

Please sign in to comment.