Skip to content

L
linux-davinci-2.6.23
Commit 372db8a7 authored by Thiago Galesi's avatar Thiago Galesi Committed by Greg Kroah-Hartman
Browse files
Options

USB: pl2303: remove 80-columns limit violations in pl2303 driver 

Fixes several lines that overrun 80 columns in Prolific pl2303 driver
and cleans up some space usages in the function calls.
Signed-off-by: default avatarThiago Galesi <thiagogalesi@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a009b75a
Show whitespace changes
Inline Side-by-side
Showing with 123 additions and 129 deletions
drivers/usb/serial/pl2303.c
View file @ 372db8a7
...@@ -84,7 +84,7 @@ static struct usb_device_id id_table [] = { ...@@ -84,7 +84,7 @@ static struct usb_device_id id_table [] = {
{ } /* Terminating entry */ { } /* Terminating entry */
}; };
MODULE_DEVICE_TABLE (usb, id_table); MODULE_DEVICE_TABLE(usb, id_table);
static struct usb_driver pl2303_driver = { static struct usb_driver pl2303_driver = {
.name = "pl2303", .name = "pl2303",
...@@ -205,7 +205,7 @@ struct pl2303_private { ...@@ -205,7 +205,7 @@ struct pl2303_private {
}; };
static int pl2303_startup (struct usb_serial *serial) static int pl2303_startup(struct usb_serial *serial)
{ {
struct pl2303_private *priv; struct pl2303_private *priv;
enum pl2303_type type = type_0; enum pl2303_type type = type_0;
...@@ -247,18 +247,19 @@ cleanup: ...@@ -247,18 +247,19 @@ cleanup:
return -ENOMEM; return -ENOMEM;
} }
static int set_control_lines (struct usb_device *dev, u8 value) static int set_control_lines(struct usb_device *dev, u8 value)
{ {
int retval; int retval;
retval = usb_control_msg (dev, usb_sndctrlpipe (dev, 0), retval = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
SET_CONTROL_REQUEST, SET_CONTROL_REQUEST_TYPE, SET_CONTROL_REQUEST, SET_CONTROL_REQUEST_TYPE,
value, 0, NULL, 0, 100); value, 0, NULL, 0, 100);
dbg("%s - value = %d, retval = %d", __FUNCTION__, value, retval); dbg("%s - value = %d, retval = %d", __FUNCTION__, value, retval);
return retval; return retval;
} }
static int pl2303_write (struct usb_serial_port *port, const unsigned char *buf, int count) static int pl2303_write(struct usb_serial_port *port, const unsigned char *buf,
int count)
{ {
struct pl2303_private *priv = usb_get_serial_port_data(port); struct pl2303_private *priv = usb_get_serial_port_data(port);
unsigned long flags; unsigned long flags;
...@@ -304,13 +305,15 @@ static void pl2303_send(struct usb_serial_port *port) ...@@ -304,13 +305,15 @@ static void pl2303_send(struct usb_serial_port *port)
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->lock, flags);
usb_serial_debug_data(debug, &port->dev, __FUNCTION__, count, port->write_urb->transfer_buffer); usb_serial_debug_data(debug, &port->dev, __FUNCTION__, count,
port->write_urb->transfer_buffer);
port->write_urb->transfer_buffer_length = count; port->write_urb->transfer_buffer_length = count;
port->write_urb->dev = port->serial->dev; port->write_urb->dev = port->serial->dev;
result = usb_submit_urb (port->write_urb, GFP_ATOMIC); result = usb_submit_urb(port->write_urb, GFP_ATOMIC);
if (result) { if (result) {
dev_err(&port->dev, "%s - failed submitting write urb, error %d\n", __FUNCTION__, result); dev_err(&port->dev, "%s - failed submitting write urb,"
" error %d\n", __FUNCTION__, result);
priv->write_urb_in_use = 0; priv->write_urb_in_use = 0;
// TODO: reschedule pl2303_send // TODO: reschedule pl2303_send
} }
...@@ -350,7 +353,8 @@ static int pl2303_chars_in_buffer(struct usb_serial_port *port) ...@@ -350,7 +353,8 @@ static int pl2303_chars_in_buffer(struct usb_serial_port *port)
return chars; return chars;
} }
static void pl2303_set_termios (struct usb_serial_port *port, struct termios *old_termios) static void pl2303_set_termios(struct usb_serial_port *port,
struct termios *old_termios)
{ {
struct usb_serial *serial = port->serial; struct usb_serial *serial = port->serial;
struct pl2303_private *priv = usb_get_serial_port_data(port); struct pl2303_private *priv = usb_get_serial_port_data(port);
...@@ -371,7 +375,8 @@ static void pl2303_set_termios (struct usb_serial_port *port, struct termios *ol ...@@ -371,7 +375,8 @@ static void pl2303_set_termios (struct usb_serial_port *port, struct termios *ol
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->lock, flags);
if (!priv->termios_initialized) { if (!priv->termios_initialized) {
*(port->tty->termios) = tty_std_termios; *(port->tty->termios) = tty_std_termios;
port->tty->termios->c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL; port->tty->termios->c_cflag = B9600 | CS8 | CREAD |
HUPCL | CLOCAL;
priv->termios_initialized = 1; priv->termios_initialized = 1;
} }
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->lock, flags);
...@@ -380,25 +385,25 @@ static void pl2303_set_termios (struct usb_serial_port *port, struct termios *ol ...@@ -380,25 +385,25 @@ static void pl2303_set_termios (struct usb_serial_port *port, struct termios *ol
/* check that they really want us to change something */ /* check that they really want us to change something */
if (old_termios) { if (old_termios) {
if ((cflag == old_termios->c_cflag) && if ((cflag == old_termios->c_cflag) &&
(RELEVANT_IFLAG(port->tty->termios->c_iflag) == RELEVANT_IFLAG(old_termios->c_iflag))) { (RELEVANT_IFLAG(port->tty->termios->c_iflag) ==
RELEVANT_IFLAG(old_termios->c_iflag))) {
dbg("%s - nothing to change...", __FUNCTION__); dbg("%s - nothing to change...", __FUNCTION__);
return; return;
} }
} }
buf = kzalloc (7, GFP_KERNEL); buf = kzalloc(7, GFP_KERNEL);
if (!buf) { if (!buf) {
dev_err(&port->dev, "%s - out of memory.\n", __FUNCTION__); dev_err(&port->dev, "%s - out of memory.\n", __FUNCTION__);
return; return;
} }
i = usb_control_msg (serial->dev, usb_rcvctrlpipe (serial->dev, 0), i = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0),
GET_LINE_REQUEST, GET_LINE_REQUEST_TYPE, GET_LINE_REQUEST, GET_LINE_REQUEST_TYPE,
0, 0, buf, 7, 100); 0, 0, buf, 7, 100);
dbg ("0xa1:0x21:0:0 %d - %x %x %x %x %x %x %x", i, dbg("0xa1:0x21:0:0 %d - %x %x %x %x %x %x %x", i,
buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6]); buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6]);
if (cflag & CSIZE) { if (cflag & CSIZE) {
switch (cflag & CSIZE) { switch (cflag & CSIZE) {
case CS5: buf[6] = 5; break; case CS5: buf[6] = 5; break;
...@@ -429,7 +434,8 @@ static void pl2303_set_termios (struct usb_serial_port *port, struct termios *ol ...@@ -429,7 +434,8 @@ static void pl2303_set_termios (struct usb_serial_port *port, struct termios *ol
case B230400: baud = 230400; break; case B230400: baud = 230400; break;
case B460800: baud = 460800; break; case B460800: baud = 460800; break;
default: default:
dev_err(&port->dev, "pl2303 driver does not support the baudrate requested (fix it)\n"); dev_err(&port->dev, "pl2303 driver does not support"
" the baudrate requested (fix it)\n");
break; break;
} }
dbg("%s - baud = %d", __FUNCTION__, baud); dbg("%s - baud = %d", __FUNCTION__, baud);
...@@ -469,10 +475,10 @@ static void pl2303_set_termios (struct usb_serial_port *port, struct termios *ol ...@@ -469,10 +475,10 @@ static void pl2303_set_termios (struct usb_serial_port *port, struct termios *ol
dbg("%s - parity = none", __FUNCTION__); dbg("%s - parity = none", __FUNCTION__);
} }
i = usb_control_msg (serial->dev, usb_sndctrlpipe (serial->dev, 0), i = usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0),
SET_LINE_REQUEST, SET_LINE_REQUEST_TYPE, SET_LINE_REQUEST, SET_LINE_REQUEST_TYPE,
0, 0, buf, 7, 100); 0, 0, buf, 7, 100);
dbg ("0x21:0x20:0:0 %d", i); dbg("0x21:0x20:0:0 %d", i);
/* change control lines if we are switching to or from B0 */ /* change control lines if we are switching to or from B0 */
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->lock, flags);
...@@ -491,10 +497,10 @@ static void pl2303_set_termios (struct usb_serial_port *port, struct termios *ol ...@@ -491,10 +497,10 @@ static void pl2303_set_termios (struct usb_serial_port *port, struct termios *ol
buf[0] = buf[1] = buf[2] = buf[3] = buf[4] = buf[5] = buf[6] = 0; buf[0] = buf[1] = buf[2] = buf[3] = buf[4] = buf[5] = buf[6] = 0;
i = usb_control_msg (serial->dev, usb_rcvctrlpipe (serial->dev, 0), i = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0),
GET_LINE_REQUEST, GET_LINE_REQUEST_TYPE, GET_LINE_REQUEST, GET_LINE_REQUEST_TYPE,
0, 0, buf, 7, 100); 0, 0, buf, 7, 100);
dbg ("0xa1:0x21:0:0 %d - %x %x %x %x %x %x %x", i, dbg("0xa1:0x21:0:0 %d - %x %x %x %x %x %x %x", i,
buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6]); buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6]);
if (cflag & CRTSCTS) { if (cflag & CRTSCTS) {
...@@ -508,13 +514,13 @@ static void pl2303_set_termios (struct usb_serial_port *port, struct termios *ol ...@@ -508,13 +514,13 @@ static void pl2303_set_termios (struct usb_serial_port *port, struct termios *ol
VENDOR_WRITE_REQUEST, VENDOR_WRITE_REQUEST,
VENDOR_WRITE_REQUEST_TYPE, VENDOR_WRITE_REQUEST_TYPE,
0x0, index, NULL, 0, 100); 0x0, index, NULL, 0, 100);
dbg ("0x40:0x1:0x0:0x%x %d", index, i); dbg("0x40:0x1:0x0:0x%x %d", index, i);
} }
kfree (buf); kfree(buf);
} }
static int pl2303_open (struct usb_serial_port *port, struct file *filp) static int pl2303_open(struct usb_serial_port *port, struct file *filp)
{ {
struct termios tmp_termios; struct termios tmp_termios;
struct usb_serial *serial = port->serial; struct usb_serial *serial = port->serial;
...@@ -568,33 +574,34 @@ static int pl2303_open (struct usb_serial_port *port, struct file *filp) ...@@ -568,33 +574,34 @@ static int pl2303_open (struct usb_serial_port *port, struct file *filp)
/* Setup termios */ /* Setup termios */
if (port->tty) { if (port->tty) {
pl2303_set_termios (port, &tmp_termios); pl2303_set_termios(port, &tmp_termios);
} }
//FIXME: need to assert RTS and DTR if CRTSCTS off //FIXME: need to assert RTS and DTR if CRTSCTS off
dbg("%s - submitting read urb", __FUNCTION__); dbg("%s - submitting read urb", __FUNCTION__);
port->read_urb->dev = serial->dev; port->read_urb->dev = serial->dev;
result = usb_submit_urb (port->read_urb, GFP_KERNEL); result = usb_submit_urb(port->read_urb, GFP_KERNEL);
if (result) { if (result) {
dev_err(&port->dev, "%s - failed submitting read urb, error %d\n", __FUNCTION__, result); dev_err(&port->dev, "%s - failed submitting read urb,"
pl2303_close (port, NULL); " error %d\n", __FUNCTION__, result);
pl2303_close(port, NULL);
return -EPROTO; return -EPROTO;
} }
dbg("%s - submitting interrupt urb", __FUNCTION__); dbg("%s - submitting interrupt urb", __FUNCTION__);
port->interrupt_in_urb->dev = serial->dev; port->interrupt_in_urb->dev = serial->dev;
result = usb_submit_urb (port->interrupt_in_urb, GFP_KERNEL); result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
if (result) { if (result) {
dev_err(&port->dev, "%s - failed submitting interrupt urb, error %d\n", __FUNCTION__, result); dev_err(&port->dev, "%s - failed submitting interrupt urb,"
pl2303_close (port, NULL); " error %d\n", __FUNCTION__, result);
pl2303_close(port, NULL);
return -EPROTO; return -EPROTO;
} }
return 0; return 0;
} }
static void pl2303_close(struct usb_serial_port *port, struct file *filp)
static void pl2303_close (struct usb_serial_port *port, struct file *filp)
{ {
struct pl2303_private *priv = usb_get_serial_port_data(port); struct pl2303_private *priv = usb_get_serial_port_data(port);
unsigned long flags; unsigned long flags;
...@@ -612,9 +619,9 @@ static void pl2303_close (struct usb_serial_port *port, struct file *filp) ...@@ -612,9 +619,9 @@ static void pl2303_close (struct usb_serial_port *port, struct file *filp)
add_wait_queue(&port->tty->write_wait, &wait); add_wait_queue(&port->tty->write_wait, &wait);
for (;;) { for (;;) {
set_current_state(TASK_INTERRUPTIBLE); set_current_state(TASK_INTERRUPTIBLE);
if (pl2303_buf_data_avail(priv->buf) == 0 if (pl2303_buf_data_avail(priv->buf) == 0 ||
|| timeout == 0 || signal_pending(current) timeout == 0 || signal_pending(current) ||
|| !usb_get_intfdata(port->serial->interface)) /* disconnect */ !usb_get_intfdata(port->serial->interface)) /* disconnect */
break; break;
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->lock, flags);
timeout = schedule_timeout(timeout); timeout = schedule_timeout(timeout);
...@@ -652,13 +659,13 @@ static void pl2303_close (struct usb_serial_port *port, struct file *filp) ...@@ -652,13 +659,13 @@ static void pl2303_close (struct usb_serial_port *port, struct file *filp)
/* drop DTR and RTS */ /* drop DTR and RTS */
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->lock, flags);
priv->line_control = 0; priv->line_control = 0;
spin_unlock_irqrestore (&priv->lock, flags); spin_unlock_irqrestore(&priv->lock, flags);
set_control_lines (port->serial->dev, 0); set_control_lines(port->serial->dev, 0);
} }
} }
} }
static int pl2303_tiocmset (struct usb_serial_port *port, struct file *file, static int pl2303_tiocmset(struct usb_serial_port *port, struct file *file,
unsigned int set, unsigned int clear) unsigned int set, unsigned int clear)
{ {
struct pl2303_private *priv = usb_get_serial_port_data(port); struct pl2303_private *priv = usb_get_serial_port_data(port);
...@@ -668,7 +675,7 @@ static int pl2303_tiocmset (struct usb_serial_port *port, struct file *file, ...@@ -668,7 +675,7 @@ static int pl2303_tiocmset (struct usb_serial_port *port, struct file *file,
if (!usb_get_intfdata(port->serial->interface)) if (!usb_get_intfdata(port->serial->interface))
return -ENODEV; return -ENODEV;
spin_lock_irqsave (&priv->lock, flags); spin_lock_irqsave(&priv->lock, flags);
if (set & TIOCM_RTS) if (set & TIOCM_RTS)
priv->line_control |= CONTROL_RTS; priv->line_control |= CONTROL_RTS;
if (set & TIOCM_DTR) if (set & TIOCM_DTR)
...@@ -678,12 +685,12 @@ static int pl2303_tiocmset (struct usb_serial_port *port, struct file *file, ...@@ -678,12 +685,12 @@ static int pl2303_tiocmset (struct usb_serial_port *port, struct file *file,
if (clear & TIOCM_DTR) if (clear & TIOCM_DTR)
priv->line_control &= ~CONTROL_DTR; priv->line_control &= ~CONTROL_DTR;
control = priv->line_control; control = priv->line_control;
spin_unlock_irqrestore (&priv->lock, flags); spin_unlock_irqrestore(&priv->lock, flags);
return set_control_lines (port->serial->dev, control); return set_control_lines(port->serial->dev, control);
} }
static int pl2303_tiocmget (struct usb_serial_port *port, struct file *file) static int pl2303_tiocmget(struct usb_serial_port *port, struct file *file)
{ {
struct pl2303_private *priv = usb_get_serial_port_data(port); struct pl2303_private *priv = usb_get_serial_port_data(port);
unsigned long flags; unsigned long flags;
...@@ -696,10 +703,10 @@ static int pl2303_tiocmget (struct usb_serial_port *port, struct file *file) ...@@ -696,10 +703,10 @@ static int pl2303_tiocmget (struct usb_serial_port *port, struct file *file)
if (!usb_get_intfdata(port->serial->interface)) if (!usb_get_intfdata(port->serial->interface))
return -ENODEV; return -ENODEV;
spin_lock_irqsave (&priv->lock, flags); spin_lock_irqsave(&priv->lock, flags);
mcr = priv->line_control; mcr = priv->line_control;
status = priv->line_status; status = priv->line_status;
spin_unlock_irqrestore (&priv->lock, flags); spin_unlock_irqrestore(&priv->lock, flags);
result = ((mcr & CONTROL_DTR) ? TIOCM_DTR : 0) result = ((mcr & CONTROL_DTR) ? TIOCM_DTR : 0)
| ((mcr & CONTROL_RTS) ? TIOCM_RTS : 0) | ((mcr & CONTROL_RTS) ? TIOCM_RTS : 0)
...@@ -721,9 +728,9 @@ static int wait_modem_info(struct usb_serial_port *port, unsigned int arg) ...@@ -721,9 +728,9 @@ static int wait_modem_info(struct usb_serial_port *port, unsigned int arg)
unsigned int status; unsigned int status;
unsigned int changed; unsigned int changed;
spin_lock_irqsave (&priv->lock, flags); spin_lock_irqsave(&priv->lock, flags);
prevstatus = priv->line_status; prevstatus = priv->line_status;
spin_unlock_irqrestore (&priv->lock, flags); spin_unlock_irqrestore(&priv->lock, flags);
while (1) { while (1) {
interruptible_sleep_on(&priv->delta_msr_wait); interruptible_sleep_on(&priv->delta_msr_wait);
...@@ -731,9 +738,9 @@ static int wait_modem_info(struct usb_serial_port *port, unsigned int arg) ...@@ -731,9 +738,9 @@ static int wait_modem_info(struct usb_serial_port *port, unsigned int arg)
if (signal_pending(current)) if (signal_pending(current))
return -ERESTARTSYS; return -ERESTARTSYS;
spin_lock_irqsave (&priv->lock, flags); spin_lock_irqsave(&priv->lock, flags);
status = priv->line_status; status = priv->line_status;
spin_unlock_irqrestore (&priv->lock, flags); spin_unlock_irqrestore(&priv->lock, flags);
changed=prevstatus^status; changed=prevstatus^status;
...@@ -749,7 +756,8 @@ static int wait_modem_info(struct usb_serial_port *port, unsigned int arg) ...@@ -749,7 +756,8 @@ static int wait_modem_info(struct usb_serial_port *port, unsigned int arg)
return 0; return 0;
} }
static int pl2303_ioctl (struct usb_serial_port *port, struct file *file, unsigned int cmd, unsigned long arg) static int pl2303_ioctl(struct usb_serial_port *port, struct file *file,
unsigned int cmd, unsigned long arg)
{ {
dbg("%s (%d) cmd = 0x%04x", __FUNCTION__, port->number, cmd); dbg("%s (%d) cmd = 0x%04x", __FUNCTION__, port->number, cmd);
...@@ -766,7 +774,7 @@ static int pl2303_ioctl (struct usb_serial_port *port, struct file *file, unsign ...@@ -766,7 +774,7 @@ static int pl2303_ioctl (struct usb_serial_port *port, struct file *file, unsign
return -ENOIOCTLCMD; return -ENOIOCTLCMD;
} }
static void pl2303_break_ctl (struct usb_serial_port *port, int break_state) static void pl2303_break_ctl(struct usb_serial_port *port, int break_state)
{ {
struct usb_serial *serial = port->serial; struct usb_serial *serial = port->serial;
u16 state; u16 state;
...@@ -780,15 +788,14 @@ static void pl2303_break_ctl (struct usb_serial_port *port, int break_state) ...@@ -780,15 +788,14 @@ static void pl2303_break_ctl (struct usb_serial_port *port, int break_state)
state = BREAK_ON; state = BREAK_ON;
dbg("%s - turning break %s", __FUNCTION__, state==BREAK_OFF ? "off" : "on"); dbg("%s - turning break %s", __FUNCTION__, state==BREAK_OFF ? "off" : "on");
result = usb_control_msg (serial->dev, usb_sndctrlpipe (serial->dev, 0), result = usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0),
BREAK_REQUEST, BREAK_REQUEST_TYPE, state, BREAK_REQUEST, BREAK_REQUEST_TYPE, state,
0, NULL, 0, 100); 0, NULL, 0, 100);
if (result) if (result)
dbg("%s - error sending break = %d", __FUNCTION__, result); dbg("%s - error sending break = %d", __FUNCTION__, result);
} }
static void pl2303_shutdown(struct usb_serial *serial)
static void pl2303_shutdown (struct usb_serial *serial)
{ {
int i; int i;
struct pl2303_private *priv; struct pl2303_private *priv;
...@@ -830,10 +837,10 @@ static void pl2303_update_line_status(struct usb_serial_port *port, ...@@ -830,10 +837,10 @@ static void pl2303_update_line_status(struct usb_serial_port *port,
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->lock, flags);
priv->line_status = data[status_idx]; priv->line_status = data[status_idx];
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->lock, flags);
wake_up_interruptible (&priv->delta_msr_wait); wake_up_interruptible(&priv->delta_msr_wait);
} }
static void pl2303_read_int_callback (struct urb *urb, struct pt_regs *regs) static void pl2303_read_int_callback(struct urb *urb, struct pt_regs *regs)
{ {
struct usb_serial_port *port = (struct usb_serial_port *) urb->context; struct usb_serial_port *port = (struct usb_serial_port *) urb->context;
unsigned char *data = urb->transfer_buffer; unsigned char *data = urb->transfer_buffer;
...@@ -850,25 +857,29 @@ static void pl2303_read_int_callback (struct urb *urb, struct pt_regs *regs) ...@@ -850,25 +857,29 @@ static void pl2303_read_int_callback (struct urb *urb, struct pt_regs *regs)
case -ENOENT: case -ENOENT:
case -ESHUTDOWN: case -ESHUTDOWN:
/* this urb is terminated, clean up */ /* this urb is terminated, clean up */
dbg("%s - urb shutting down with status: %d", __FUNCTION__, urb->status); dbg("%s - urb shutting down with status: %d", __FUNCTION__,
urb->status);
return; return;
default: default:
dbg("%s - nonzero urb status received: %d", __FUNCTION__, urb->status); dbg("%s - nonzero urb status received: %d", __FUNCTION__,
urb->status);
goto exit; goto exit;
} }
usb_serial_debug_data(debug, &port->dev, __FUNCTION__, urb->actual_length, urb->transfer_buffer); usb_serial_debug_data(debug, &port->dev, __FUNCTION__,
urb->actual_length, urb->transfer_buffer);
pl2303_update_line_status(port, data, actual_length); pl2303_update_line_status(port, data, actual_length);
exit: exit:
status = usb_submit_urb (urb, GFP_ATOMIC); status = usb_submit_urb(urb, GFP_ATOMIC);
if (status) if (status)
dev_err(&urb->dev->dev, "%s - usb_submit_urb failed with result %d\n", dev_err(&urb->dev->dev,
"%s - usb_submit_urb failed with result %d\n",
__FUNCTION__, status); __FUNCTION__, status);
} }
static void pl2303_read_bulk_callback(struct urb *urb, struct pt_regs *regs)
static void pl2303_read_bulk_callback (struct urb *urb, struct pt_regs *regs)
{ {
struct usb_serial_port *port = (struct usb_serial_port *) urb->context; struct usb_serial_port *port = (struct usb_serial_port *) urb->context;
struct pl2303_private *priv = usb_get_serial_port_data(port); struct pl2303_private *priv = usb_get_serial_port_data(port);
...@@ -889,20 +900,25 @@ static void pl2303_read_bulk_callback (struct urb *urb, struct pt_regs *regs) ...@@ -889,20 +900,25 @@ static void pl2303_read_bulk_callback (struct urb *urb, struct pt_regs *regs)
return; return;
} }
if (urb->status == -EPROTO) { if (urb->status == -EPROTO) {
/* PL2303 mysteriously fails with -EPROTO reschedule the read */ /* PL2303 mysteriously fails with -EPROTO reschedule
dbg("%s - caught -EPROTO, resubmitting the urb", __FUNCTION__); * the read */
dbg("%s - caught -EPROTO, resubmitting the urb",
__FUNCTION__);
urb->status = 0; urb->status = 0;
urb->dev = port->serial->dev; urb->dev = port->serial->dev;
result = usb_submit_urb(urb, GFP_ATOMIC); result = usb_submit_urb(urb, GFP_ATOMIC);
if (result) if (result)
dev_err(&urb->dev->dev, "%s - failed resubmitting read urb, error %d\n", __FUNCTION__, result); dev_err(&urb->dev->dev, "%s - failed"
" resubmitting read urb, error %d\n",
__FUNCTION__, result);
return; return;
} }
dbg("%s - unable to handle the error, exiting.", __FUNCTION__); dbg("%s - unable to handle the error, exiting.", __FUNCTION__);
return; return;
} }
usb_serial_debug_data(debug, &port->dev, __FUNCTION__, urb->actual_length, data); usb_serial_debug_data(debug, &port->dev, __FUNCTION__,
urb->actual_length, data);
/* get tty_flag from status */ /* get tty_flag from status */
tty_flag = TTY_NORMAL; tty_flag = TTY_NORMAL;
...@@ -911,7 +927,7 @@ static void pl2303_read_bulk_callback (struct urb *urb, struct pt_regs *regs) ...@@ -911,7 +927,7 @@ static void pl2303_read_bulk_callback (struct urb *urb, struct pt_regs *regs)
status = priv->line_status; status = priv->line_status;
priv->line_status &= ~UART_STATE_TRANSIENT_MASK; priv->line_status &= ~UART_STATE_TRANSIENT_MASK;
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->lock, flags);
wake_up_interruptible (&priv->delta_msr_wait); wake_up_interruptible(&priv->delta_msr_wait);
/* break takes precedence over parity, */ /* break takes precedence over parity, */
/* which takes precedence over framing errors */ /* which takes precedence over framing errors */
...@@ -930,8 +946,8 @@ static void pl2303_read_bulk_callback (struct urb *urb, struct pt_regs *regs) ...@@ -930,8 +946,8 @@ static void pl2303_read_bulk_callback (struct urb *urb, struct pt_regs *regs)
if (status & UART_OVERRUN_ERROR) if (status & UART_OVERRUN_ERROR)
tty_insert_flip_char(tty, 0, TTY_OVERRUN); tty_insert_flip_char(tty, 0, TTY_OVERRUN);
for (i = 0; i < urb->actual_length; ++i) for (i = 0; i < urb->actual_length; ++i)
tty_insert_flip_char (tty, data[i], tty_flag); tty_insert_flip_char(tty, data[i], tty_flag);
tty_flip_buffer_push (tty); tty_flip_buffer_push(tty);
} }
/* Schedule the next read _if_ we are still open */ /* Schedule the next read _if_ we are still open */
...@@ -939,15 +955,14 @@ static void pl2303_read_bulk_callback (struct urb *urb, struct pt_regs *regs) ...@@ -939,15 +955,14 @@ static void pl2303_read_bulk_callback (struct urb *urb, struct pt_regs *regs)
urb->dev = port->serial->dev; urb->dev = port->serial->dev;
result = usb_submit_urb(urb, GFP_ATOMIC); result = usb_submit_urb(urb, GFP_ATOMIC);
if (result) if (result)
dev_err(&urb->dev->dev, "%s - failed resubmitting read urb, error %d\n", __FUNCTION__, result); dev_err(&urb->dev->dev, "%s - failed resubmitting"
" read urb, error %d\n", __FUNCTION__, result);
} }
return; return;
} }
static void pl2303_write_bulk_callback(struct urb *urb, struct pt_regs *regs)
static void pl2303_write_bulk_callback (struct urb *urb, struct pt_regs *regs)
{ {
struct usb_serial_port *port = (struct usb_serial_port *) urb->context; struct usb_serial_port *port = (struct usb_serial_port *) urb->context;
struct pl2303_private *priv = usb_get_serial_port_data(port); struct pl2303_private *priv = usb_get_serial_port_data(port);
...@@ -963,18 +978,21 @@ static void pl2303_write_bulk_callback (struct urb *urb, struct pt_regs *regs) ...@@ -963,18 +978,21 @@ static void pl2303_write_bulk_callback (struct urb *urb, struct pt_regs *regs)
case -ENOENT: case -ENOENT:
case -ESHUTDOWN: case -ESHUTDOWN:
/* this urb is terminated, clean up */ /* this urb is terminated, clean up */
dbg("%s - urb shutting down with status: %d", __FUNCTION__, urb->status); dbg("%s - urb shutting down with status: %d", __FUNCTION__,
urb->status);
priv->write_urb_in_use = 0; priv->write_urb_in_use = 0;
return; return;
default: default:
/* error in the urb, so we have to resubmit it */ /* error in the urb, so we have to resubmit it */
dbg("%s - Overflow in write", __FUNCTION__); dbg("%s - Overflow in write", __FUNCTION__);
dbg("%s - nonzero write bulk status received: %d", __FUNCTION__, urb->status); dbg("%s - nonzero write bulk status received: %d", __FUNCTION__,
urb->status);
port->write_urb->transfer_buffer_length = 1; port->write_urb->transfer_buffer_length = 1;
port->write_urb->dev = port->serial->dev; port->write_urb->dev = port->serial->dev;
result = usb_submit_urb (port->write_urb, GFP_ATOMIC); result = usb_submit_urb(port->write_urb, GFP_ATOMIC);
if (result) if (result)
dev_err(&urb->dev->dev, "%s - failed resubmitting write urb, error %d\n", __FUNCTION__, result); dev_err(&urb->dev->dev, "%s - failed resubmitting write"
" urb, error %d\n", __FUNCTION__, result);
else else
return; return;
} }
...@@ -985,19 +1003,15 @@ static void pl2303_write_bulk_callback (struct urb *urb, struct pt_regs *regs) ...@@ -985,19 +1003,15 @@ static void pl2303_write_bulk_callback (struct urb *urb, struct pt_regs *regs)
pl2303_send(port); pl2303_send(port);
} }
/* /*
* pl2303_buf_alloc * pl2303_buf_alloc
* *
* Allocate a circular buffer and all associated memory. * Allocate a circular buffer and all associated memory.
*/ */
static struct pl2303_buf *pl2303_buf_alloc(unsigned int size) static struct pl2303_buf *pl2303_buf_alloc(unsigned int size)
{ {
struct pl2303_buf *pb; struct pl2303_buf *pb;
if (size == 0) if (size == 0)
return NULL; return NULL;
...@@ -1015,16 +1029,13 @@ static struct pl2303_buf *pl2303_buf_alloc(unsigned int size) ...@@ -1015,16 +1029,13 @@ static struct pl2303_buf *pl2303_buf_alloc(unsigned int size)
pb->buf_get = pb->buf_put = pb->buf_buf; pb->buf_get = pb->buf_put = pb->buf_buf;
return pb; return pb;
} }
/* /*
* pl2303_buf_free * pl2303_buf_free
* *
* Free the buffer and all associated memory. * Free the buffer and all associated memory.
*/ */
static void pl2303_buf_free(struct pl2303_buf *pb) static void pl2303_buf_free(struct pl2303_buf *pb)
{ {
if (pb) { if (pb) {
...@@ -1033,13 +1044,11 @@ static void pl2303_buf_free(struct pl2303_buf *pb) ...@@ -1033,13 +1044,11 @@ static void pl2303_buf_free(struct pl2303_buf *pb)
} }
} }
/* /*
* pl2303_buf_clear * pl2303_buf_clear
* *
* Clear out all data in the circular buffer. * Clear out all data in the circular buffer.
*/ */
static void pl2303_buf_clear(struct pl2303_buf *pb) static void pl2303_buf_clear(struct pl2303_buf *pb)
{ {
if (pb != NULL) if (pb != NULL)
...@@ -1047,14 +1056,12 @@ static void pl2303_buf_clear(struct pl2303_buf *pb) ...@@ -1047,14 +1056,12 @@ static void pl2303_buf_clear(struct pl2303_buf *pb)
/* equivalent to a get of all data available */ /* equivalent to a get of all data available */
} }
/* /*
* pl2303_buf_data_avail * pl2303_buf_data_avail
* *
* Return the number of bytes of data available in the circular * Return the number of bytes of data available in the circular
* buffer. * buffer.
*/ */
static unsigned int pl2303_buf_data_avail(struct pl2303_buf *pb) static unsigned int pl2303_buf_data_avail(struct pl2303_buf *pb)
{ {
if (pb != NULL) if (pb != NULL)
...@@ -1063,14 +1070,12 @@ static unsigned int pl2303_buf_data_avail(struct pl2303_buf *pb) ...@@ -1063,14 +1070,12 @@ static unsigned int pl2303_buf_data_avail(struct pl2303_buf *pb)
return 0; return 0;
} }
/* /*
* pl2303_buf_space_avail * pl2303_buf_space_avail
* *
* Return the number of bytes of space available in the circular * Return the number of bytes of space available in the circular
* buffer. * buffer.
*/ */
static unsigned int pl2303_buf_space_avail(struct pl2303_buf *pb) static unsigned int pl2303_buf_space_avail(struct pl2303_buf *pb)
{ {
if (pb != NULL) if (pb != NULL)
...@@ -1079,7 +1084,6 @@ static unsigned int pl2303_buf_space_avail(struct pl2303_buf *pb) ...@@ -1079,7 +1084,6 @@ static unsigned int pl2303_buf_space_avail(struct pl2303_buf *pb)
return 0; return 0;
} }
/* /*
* pl2303_buf_put * pl2303_buf_put
* *
...@@ -1088,14 +1092,11 @@ static unsigned int pl2303_buf_space_avail(struct pl2303_buf *pb) ...@@ -1088,14 +1092,11 @@ static unsigned int pl2303_buf_space_avail(struct pl2303_buf *pb)
* *
* Return the number of bytes copied. * Return the number of bytes copied.
*/ */
static unsigned int pl2303_buf_put(struct pl2303_buf *pb, const char *buf, static unsigned int pl2303_buf_put(struct pl2303_buf *pb, const char *buf,
unsigned int count) unsigned int count)
{ {
unsigned int len; unsigned int len;
if (pb == NULL) if (pb == NULL)
return 0; return 0;
...@@ -1120,10 +1121,8 @@ static unsigned int pl2303_buf_put(struct pl2303_buf *pb, const char *buf, ...@@ -1120,10 +1121,8 @@ static unsigned int pl2303_buf_put(struct pl2303_buf *pb, const char *buf,
} }
return count; return count;
} }
/* /*
* pl2303_buf_get * pl2303_buf_get
* *
...@@ -1132,14 +1131,11 @@ static unsigned int pl2303_buf_put(struct pl2303_buf *pb, const char *buf, ...@@ -1132,14 +1131,11 @@ static unsigned int pl2303_buf_put(struct pl2303_buf *pb, const char *buf,
* *
* Return the number of bytes copied. * Return the number of bytes copied.
*/ */
static unsigned int pl2303_buf_get(struct pl2303_buf *pb, char *buf, static unsigned int pl2303_buf_get(struct pl2303_buf *pb, char *buf,
unsigned int count) unsigned int count)
{ {
unsigned int len; unsigned int len;
if (pb == NULL) if (pb == NULL)
return 0; return 0;
...@@ -1164,12 +1160,12 @@ static unsigned int pl2303_buf_get(struct pl2303_buf *pb, char *buf, ...@@ -1164,12 +1160,12 @@ static unsigned int pl2303_buf_get(struct pl2303_buf *pb, char *buf,
} }
return count; return count;
} }
static int __init pl2303_init (void) static int __init pl2303_init(void)
{ {
int retval; int retval;
retval = usb_serial_register(&pl2303_device); retval = usb_serial_register(&pl2303_device);
if (retval) if (retval)
goto failed_usb_serial_register; goto failed_usb_serial_register;
...@@ -1184,14 +1180,12 @@ failed_usb_serial_register: ...@@ -1184,14 +1180,12 @@ failed_usb_serial_register:
return retval; return retval;
} }
static void __exit pl2303_exit(void)
static void __exit pl2303_exit (void)
{ {
usb_deregister (&pl2303_driver); usb_deregister(&pl2303_driver);
usb_serial_deregister (&pl2303_device); usb_serial_deregister(&pl2303_device);
} }
module_init(pl2303_init); module_init(pl2303_init);
module_exit(pl2303_exit); module_exit(pl2303_exit);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment