mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-11-01 17:08:10 +00:00
Code Issues Releases Wiki Activity

USB: serial: digi_acceleport: clean up urb->status usage

Browse source 
This done in anticipation of removal of urb->status, which will make
that patch easier to review and apply in the future.


Cc: <linux-usb-devel@lists.sourceforge.net>
Cc: Peter Berger <pberger@brimson.com>
Cc: Al Borchers <borchers@steinerpoint.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2007-06-15 15:44:13 -07:00
parent 8d7bc55ecf
commit 85d7510711
1 changed files with 26 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
drivers/usb/serial/digi_acceleport.c
View file

@ -1324,19 +1324,21 @@ static void digi_write_bulk_callback( struct urb *urb )
struct digi_port *priv; struct digi_port *priv;
struct digi_serial *serial_priv; struct digi_serial *serial_priv;
int ret = 0; int ret = 0;
int status = urb->status;
dbg( "digi_write_bulk_callback: TOP, urb->status=%d", urb->status ); dbg("digi_write_bulk_callback: TOP, urb status=%d", status);
/* port and serial sanity check */ /* port and serial sanity check */
if( port == NULL || (priv=usb_get_serial_port_data(port)) == NULL ) { if( port == NULL || (priv=usb_get_serial_port_data(port)) == NULL ) {
err("%s: port or port->private is NULL, status=%d", __FUNCTION__, err("%s: port or port->private is NULL, status=%d",
urb->status ); __FUNCTION__, status);
return; return;
} }
serial = port->serial; serial = port->serial;
if( serial == NULL || (serial_priv=usb_get_serial_data(serial)) == NULL ) { if( serial == NULL || (serial_priv=usb_get_serial_data(serial)) == NULL ) {
err("%s: serial or serial->private is NULL, status=%d", __FUNCTION__, urb->status ); err("%s: serial or serial->private is NULL, status=%d",
__FUNCTION__, status);
return; return;
} }
@ -1740,25 +1742,28 @@ static void digi_read_bulk_callback( struct urb *urb )
struct digi_port *priv; struct digi_port *priv;
struct digi_serial *serial_priv; struct digi_serial *serial_priv;
int ret; int ret;
int status = urb->status;
dbg( "digi_read_bulk_callback: TOP" ); dbg( "digi_read_bulk_callback: TOP" );
/* port sanity check, do not resubmit if port is not valid */ /* port sanity check, do not resubmit if port is not valid */
if( port == NULL || (priv=usb_get_serial_port_data(port)) == NULL ) { if( port == NULL || (priv=usb_get_serial_port_data(port)) == NULL ) {
err("%s: port or port->private is NULL, status=%d", __FUNCTION__, err("%s: port or port->private is NULL, status=%d",
urb->status ); __FUNCTION__, status);
return; return;
} }
if( port->serial == NULL if( port->serial == NULL
|| (serial_priv=usb_get_serial_data(port->serial)) == NULL ) { || (serial_priv=usb_get_serial_data(port->serial)) == NULL ) {
err("%s: serial is bad or serial->private is NULL, status=%d", __FUNCTION__, urb->status ); err("%s: serial is bad or serial->private is NULL, status=%d",
__FUNCTION__, status);
return; return;
} }
/* do not resubmit urb if it has any status error */ /* do not resubmit urb if it has any status error */
if( urb->status ) { if (status) {
err("%s: nonzero read bulk status: status=%d, port=%d", __FUNCTION__, urb->status, priv->dp_port_num ); err("%s: nonzero read bulk status: status=%d, port=%d",
__FUNCTION__, status, priv->dp_port_num);
return; return;
} }
@ -1799,10 +1804,11 @@ static int digi_read_inb_callback( struct urb *urb )
struct digi_port *priv = usb_get_serial_port_data(port); struct digi_port *priv = usb_get_serial_port_data(port);
int opcode = ((unsigned char *)urb->transfer_buffer)[0]; int opcode = ((unsigned char *)urb->transfer_buffer)[0];
int len = ((unsigned char *)urb->transfer_buffer)[1]; int len = ((unsigned char *)urb->transfer_buffer)[1];
int status = ((unsigned char *)urb->transfer_buffer)[2]; int port_status = ((unsigned char *)urb->transfer_buffer)[2];
unsigned char *data = ((unsigned char *)urb->transfer_buffer)+3; unsigned char *data = ((unsigned char *)urb->transfer_buffer)+3;
int flag,throttled; int flag,throttled;
int i; int i;
int status = urb->status;
/* do not process callbacks on closed ports */ /* do not process callbacks on closed ports */
/* but do continue the read chain */ /* but do continue the read chain */
@ -1811,7 +1817,10 @@ static int digi_read_inb_callback( struct urb *urb )
/* short/multiple packet check */ /* short/multiple packet check */
if( urb->actual_length != len + 2 ) { if( urb->actual_length != len + 2 ) {
err("%s: INCOMPLETE OR MULTIPLE PACKET, urb->status=%d, port=%d, opcode=%d, len=%d, actual_length=%d, status=%d", __FUNCTION__, urb->status, priv->dp_port_num, opcode, len, urb->actual_length, status ); err("%s: INCOMPLETE OR MULTIPLE PACKET, urb status=%d, "
"port=%d, opcode=%d, len=%d, actual_length=%d, "
"port_status=%d", __FUNCTION__, status, priv->dp_port_num,
opcode, len, urb->actual_length, port_status);
return( -1 ); return( -1 );
} }
@ -1826,25 +1835,25 @@ static int digi_read_inb_callback( struct urb *urb )
/* receive data */ /* receive data */
if( opcode == DIGI_CMD_RECEIVE_DATA ) { if( opcode == DIGI_CMD_RECEIVE_DATA ) {
/* get flag from status */ /* get flag from port_status */
flag = 0; flag = 0;
/* overrun is special, not associated with a char */ /* overrun is special, not associated with a char */
if( status & DIGI_OVERRUN_ERROR ) { if (port_status & DIGI_OVERRUN_ERROR) {
tty_insert_flip_char( tty, 0, TTY_OVERRUN ); tty_insert_flip_char( tty, 0, TTY_OVERRUN );
} }
/* break takes precedence over parity, */ /* break takes precedence over parity, */
/* which takes precedence over framing errors */ /* which takes precedence over framing errors */
if( status & DIGI_BREAK_ERROR ) { if (port_status & DIGI_BREAK_ERROR) {
flag = TTY_BREAK; flag = TTY_BREAK;
} else if( status & DIGI_PARITY_ERROR ) { } else if (port_status & DIGI_PARITY_ERROR) {
flag = TTY_PARITY; flag = TTY_PARITY;
} else if( status & DIGI_FRAMING_ERROR ) { } else if (port_status & DIGI_FRAMING_ERROR) {
flag = TTY_FRAME; flag = TTY_FRAME;
} }
/* data length is len-1 (one byte of len is status) */ /* data length is len-1 (one byte of len is port_status) */
--len; --len;
len = tty_buffer_request_room(tty, len); len = tty_buffer_request_room(tty, len);