Skip to content

Commit

Permalink
USB: serial: pl2303: convert dbg() calls to dev_dbg()
Browse files Browse the repository at this point in the history 
This converts the usage of dbg() to dev_dbg() where needed, and removed
a bunch of these calls where they were just "tracing" calls, which are
no longer needed.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Greg Kroah-Hartman committed May 3, 2012
1 parent cbad67e commit d8789b2
Showing 1 changed file with 36 additions and 47 deletions.
83 changes: 36 additions & 47 deletions drivers/usb/serial/pl2303.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,9 @@ static int pl2303_vendor_read(__u16 value, __u16 index,
int res = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0),
VENDOR_READ_REQUEST, VENDOR_READ_REQUEST_TYPE,
value, index, buf, 1, 100);
dbg("0x%x:0x%x:0x%x:0x%x %d - %x", VENDOR_READ_REQUEST_TYPE,
VENDOR_READ_REQUEST, value, index, res, buf[0]);
dev_dbg(&serial->dev->dev, "0x%x:0x%x:0x%x:0x%x %d - %x\n",
VENDOR_READ_REQUEST_TYPE, VENDOR_READ_REQUEST, value, index,
res, buf[0]);
return res;
}

Expand All @@ -170,8 +171,9 @@ static int pl2303_vendor_write(__u16 value, __u16 index,
int res = usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0),
VENDOR_WRITE_REQUEST, VENDOR_WRITE_REQUEST_TYPE,
value, index, NULL, 0, 100);
dbg("0x%x:0x%x:0x%x:0x%x %d", VENDOR_WRITE_REQUEST_TYPE,
VENDOR_WRITE_REQUEST, value, index, res);
dev_dbg(&serial->dev->dev, "0x%x:0x%x:0x%x:0x%x %d\n",
VENDOR_WRITE_REQUEST_TYPE, VENDOR_WRITE_REQUEST, value, index,
res);
return res;
}

Expand All @@ -194,7 +196,7 @@ static int pl2303_startup(struct usb_serial *serial)
type = type_1;
else if (serial->dev->descriptor.bDeviceClass == 0xFF)
type = type_1;
dbg("device type: %d", type);
dev_dbg(&serial->interface->dev, "device type: %d\n", type);

for (i = 0; i < serial->num_ports; ++i) {
priv = kzalloc(sizeof(struct pl2303_private), GFP_KERNEL);
Expand Down Expand Up @@ -241,7 +243,8 @@ static int set_control_lines(struct usb_device *dev, u8 value)
retval = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
SET_CONTROL_REQUEST, SET_CONTROL_REQUEST_TYPE,
value, 0, NULL, 0, 100);
dbg("%s - value = %d, retval = %d", __func__, value, retval);
dev_dbg(&dev->dev, "%s - value = %d, retval = %d\n", __func__,
value, retval);
return retval;
}

Expand All @@ -263,8 +266,6 @@ static void pl2303_set_termios(struct tty_struct *tty,
int baud_floor, baud_ceil;
int k;

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

/* The PL2303 is reported to lose bytes if you change
serial settings even to the same values as before. Thus
we actually need to filter in this specific case */
Expand All @@ -285,7 +286,7 @@ static void pl2303_set_termios(struct tty_struct *tty,
i = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0),
GET_LINE_REQUEST, GET_LINE_REQUEST_TYPE,
0, 0, buf, 7, 100);
dbg("0xa1:0x21:0:0 %d - %x %x %x %x %x %x %x", i,
dev_dbg(&port->dev, "0xa1:0x21:0:0 %d - %x %x %x %x %x %x %x\n", i,
buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6]);

if (cflag & CSIZE) {
Expand All @@ -304,7 +305,7 @@ static void pl2303_set_termios(struct tty_struct *tty,
buf[6] = 8;
break;
}
dbg("%s - data bits = %d", __func__, buf[6]);
dev_dbg(&port->dev, "data bits = %d\n", buf[6]);
}

/* For reference buf[0]:buf[3] baud rate value */
Expand All @@ -313,7 +314,7 @@ static void pl2303_set_termios(struct tty_struct *tty,
* 9600 baud (at least my PL2303X always does)
*/
baud = tty_get_baud_rate(tty);
dbg("%s - baud requested = %d", __func__, baud);
dev_dbg(&port->dev, "baud requested = %d\n", baud);
if (baud) {
/* Set baudrate to nearest supported value */
for (k=0; k<ARRAY_SIZE(baud_sup); k++) {
Expand All @@ -339,7 +340,7 @@ static void pl2303_set_termios(struct tty_struct *tty,
else if (baud > 6000000)
baud = 6000000;
}
dbg("%s - baud set = %d", __func__, baud);
dev_dbg(&port->dev, "baud set = %d\n", baud);
if (baud <= 115200) {
buf[0] = baud & 0xff;
buf[1] = (baud >> 8) & 0xff;
Expand Down Expand Up @@ -370,14 +371,14 @@ static void pl2303_set_termios(struct tty_struct *tty,
*/
if ((cflag & CSIZE) == CS5) {
buf[4] = 1;
dbg("%s - stop bits = 1.5", __func__);
dev_dbg(&port->dev, "stop bits = 1.5\n");
} else {
buf[4] = 2;
dbg("%s - stop bits = 2", __func__);
dev_dbg(&port->dev, "stop bits = 2\n");
}
} else {
buf[4] = 0;
dbg("%s - stop bits = 1", __func__);
dev_dbg(&port->dev, "stop bits = 1\n");
}

if (cflag & PARENB) {
Expand All @@ -389,29 +390,29 @@ static void pl2303_set_termios(struct tty_struct *tty,
if (cflag & PARODD) {
if (cflag & CMSPAR) {
buf[5] = 3;
dbg("%s - parity = mark", __func__);
dev_dbg(&port->dev, "parity = mark\n");
} else {
buf[5] = 1;
dbg("%s - parity = odd", __func__);
dev_dbg(&port->dev, "parity = odd\n");
}
} else {
if (cflag & CMSPAR) {
buf[5] = 4;
dbg("%s - parity = space", __func__);
dev_dbg(&port->dev, "parity = space\n");
} else {
buf[5] = 2;
dbg("%s - parity = even", __func__);
dev_dbg(&port->dev, "parity = even\n");
}
}
} else {
buf[5] = 0;
dbg("%s - parity = none", __func__);
dev_dbg(&port->dev, "parity = none\n");
}

i = usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0),
SET_LINE_REQUEST, SET_LINE_REQUEST_TYPE,
0, 0, buf, 7, 100);
dbg("0x21:0x20:0:0 %d", i);
dev_dbg(&port->dev, "0x21:0x20:0:0 %d\n", i);

/* change control lines if we are switching to or from B0 */
spin_lock_irqsave(&priv->lock, flags);
Expand All @@ -433,7 +434,7 @@ static void pl2303_set_termios(struct tty_struct *tty,
i = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0),
GET_LINE_REQUEST, GET_LINE_REQUEST_TYPE,
0, 0, buf, 7, 100);
dbg("0xa1:0x21:0:0 %d - %x %x %x %x %x %x %x", i,
dev_dbg(&port->dev, "0xa1:0x21:0:0 %d - %x %x %x %x %x %x %x\n", i,
buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6]);

if (cflag & CRTSCTS) {
Expand Down Expand Up @@ -471,8 +472,6 @@ static void pl2303_dtr_rts(struct usb_serial_port *port, int on)

static void pl2303_close(struct usb_serial_port *port)
{
dbg("%s - port %d", __func__, port->number);

usb_serial_generic_close(port);
usb_kill_urb(port->interrupt_in_urb);
}
Expand All @@ -484,8 +483,6 @@ static int pl2303_open(struct tty_struct *tty, struct usb_serial_port *port)
struct pl2303_private *priv = usb_get_serial_port_data(port);
int result;

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

if (priv->type != HX) {
usb_clear_halt(serial->dev, port->write_urb->pipe);
usb_clear_halt(serial->dev, port->read_urb->pipe);
Expand All @@ -499,7 +496,6 @@ static int pl2303_open(struct tty_struct *tty, struct usb_serial_port *port)
if (tty)
pl2303_set_termios(tty, port, &tmp_termios);

dbg("%s - submitting interrupt urb", __func__);
result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
if (result) {
dev_err(&port->dev, "%s - failed submitting interrupt urb,"
Expand Down Expand Up @@ -558,8 +554,6 @@ static int pl2303_tiocmget(struct tty_struct *tty)
unsigned int status;
unsigned int result;

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

spin_lock_irqsave(&priv->lock, flags);
mcr = priv->line_control;
status = priv->line_status;
Expand All @@ -572,7 +566,7 @@ static int pl2303_tiocmget(struct tty_struct *tty)
| ((status & UART_RING) ? TIOCM_RI : 0)
| ((status & UART_DCD) ? TIOCM_CD : 0);

dbg("%s - result = %x", __func__, result);
dev_dbg(&port->dev, "%s - result = %x\n", __func__, result);

return result;
}
Expand Down Expand Up @@ -626,7 +620,8 @@ static int pl2303_ioctl(struct tty_struct *tty,
{
struct serial_struct ser;
struct usb_serial_port *port = tty->driver_data;
dbg("%s (%d) cmd = 0x%04x", __func__, port->number, cmd);

dev_dbg(&port->dev, "%s cmd = 0x%04x\n", __func__, cmd);

switch (cmd) {
case TIOCGSERIAL:
Expand All @@ -642,10 +637,10 @@ static int pl2303_ioctl(struct tty_struct *tty,
return 0;

case TIOCMIWAIT:
dbg("%s (%d) TIOCMIWAIT", __func__, port->number);
dev_dbg(&port->dev, "%s TIOCMIWAIT\n", __func__);
return wait_modem_info(port, arg);
default:
dbg("%s not supported = 0x%04x", __func__, cmd);
dev_dbg(&port->dev, "%s not supported = 0x%04x\n", __func__, cmd);
break;
}
return -ENOIOCTLCMD;
Expand All @@ -658,29 +653,25 @@ static void pl2303_break_ctl(struct tty_struct *tty, int break_state)
u16 state;
int result;

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

if (break_state == 0)
state = BREAK_OFF;
else
state = BREAK_ON;
dbg("%s - turning break %s", __func__,
dev_dbg(&port->dev, "%s - turning break %s\n", __func__,
state == BREAK_OFF ? "off" : "on");

result = usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0),
BREAK_REQUEST, BREAK_REQUEST_TYPE, state,
0, NULL, 0, 100);
if (result)
dbg("%s - error sending break = %d", __func__, result);
dev_err(&port->dev, "error sending break = %d\n", result);
}

static void pl2303_release(struct usb_serial *serial)
{
int i;
struct pl2303_private *priv;

dbg("%s", __func__);

for (i = 0; i < serial->num_ports; ++i) {
priv = usb_get_serial_port_data(serial->port[i]);
kfree(priv);
Expand Down Expand Up @@ -743,8 +734,6 @@ static void pl2303_read_int_callback(struct urb *urb)
int status = urb->status;
int retval;

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

switch (status) {
case 0:
/* success */
Expand All @@ -753,12 +742,12 @@ static void pl2303_read_int_callback(struct urb *urb)
case -ENOENT:
case -ESHUTDOWN:
/* this urb is terminated, clean up */
dbg("%s - urb shutting down with status: %d", __func__,
status);
dev_dbg(&port->dev, "%s - urb shutting down with status: %d\n",
__func__, status);
return;
default:
dbg("%s - nonzero urb status received: %d", __func__,
status);
dev_dbg(&port->dev, "%s - nonzero urb status received: %d\n",
__func__, status);
goto exit;
}

Expand All @@ -770,7 +759,7 @@ static void pl2303_read_int_callback(struct urb *urb)
exit:
retval = usb_submit_urb(urb, GFP_ATOMIC);
if (retval)
dev_err(&urb->dev->dev,
dev_err(&port->dev,
"%s - usb_submit_urb failed with result %d\n",
__func__, retval);
}
Expand Down Expand Up @@ -808,7 +797,7 @@ static void pl2303_process_read_urb(struct urb *urb)
tty_flag = TTY_PARITY;
else if (line_status & UART_FRAME_ERROR)
tty_flag = TTY_FRAME;
dbg("%s - tty_flag = %d", __func__, tty_flag);
dev_dbg(&port->dev, "%s - tty_flag = %d\n", __func__, tty_flag);

/* overrun is special, not associated with a char */
if (line_status & UART_OVERRUN_ERROR)
Expand Down

0 comments on commit d8789b2

Please sign in to comment.