Skip to content

L
linux-davinci
Commit 95b93454 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

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

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>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 3152b74f
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 20 deletions
drivers/usb/serial/keyspan.c
View file @ 95b93454
...@@ -427,14 +427,15 @@ static void usa26_indat_callback(struct urb *urb) ...@@ -427,14 +427,15 @@ static void usa26_indat_callback(struct urb *urb)
struct usb_serial_port *port; struct usb_serial_port *port;
struct tty_struct *tty; struct tty_struct *tty;
unsigned char *data = urb->transfer_buffer; unsigned char *data = urb->transfer_buffer;
int status = urb->status;
dbg ("%s", __FUNCTION__); dbg ("%s", __FUNCTION__);
endpoint = usb_pipeendpoint(urb->pipe); endpoint = usb_pipeendpoint(urb->pipe);
if (urb->status) { if (status) {
dbg("%s - nonzero status: %x on endpoint %d.", dbg("%s - nonzero status: %x on endpoint %d.",
__FUNCTION__, urb->status, endpoint); __FUNCTION__, status, endpoint);
return; return;
} }
...@@ -519,11 +520,12 @@ static void usa26_instat_callback(struct urb *urb) ...@@ -519,11 +520,12 @@ static void usa26_instat_callback(struct urb *urb)
struct usb_serial_port *port; struct usb_serial_port *port;
struct keyspan_port_private *p_priv; struct keyspan_port_private *p_priv;
int old_dcd_state, err; int old_dcd_state, err;
int status = urb->status;
serial = (struct usb_serial *) urb->context; serial = (struct usb_serial *) urb->context;
if (urb->status) { if (status) {
dbg("%s - nonzero status: %x", __FUNCTION__, urb->status); dbg("%s - nonzero status: %x", __FUNCTION__, status);
return; return;
} }
if (urb->actual_length != 9) { if (urb->actual_length != 9) {
...@@ -587,6 +589,7 @@ static void usa28_indat_callback(struct urb *urb) ...@@ -587,6 +589,7 @@ static void usa28_indat_callback(struct urb *urb)
struct tty_struct *tty; struct tty_struct *tty;
unsigned char *data; unsigned char *data;
struct keyspan_port_private *p_priv; struct keyspan_port_private *p_priv;
int status = urb->status;
dbg ("%s", __FUNCTION__); dbg ("%s", __FUNCTION__);
...@@ -598,9 +601,9 @@ static void usa28_indat_callback(struct urb *urb) ...@@ -598,9 +601,9 @@ static void usa28_indat_callback(struct urb *urb)
return; return;
do { do {
if (urb->status) { if (status) {
dbg("%s - nonzero status: %x on endpoint %d.", dbg("%s - nonzero status: %x on endpoint %d.",
__FUNCTION__, urb->status, usb_pipeendpoint(urb->pipe)); __FUNCTION__, status, usb_pipeendpoint(urb->pipe));
return; return;
} }
...@@ -656,11 +659,12 @@ static void usa28_instat_callback(struct urb *urb) ...@@ -656,11 +659,12 @@ static void usa28_instat_callback(struct urb *urb)
struct usb_serial_port *port; struct usb_serial_port *port;
struct keyspan_port_private *p_priv; struct keyspan_port_private *p_priv;
int old_dcd_state; int old_dcd_state;
int status = urb->status;
serial = (struct usb_serial *) urb->context; serial = (struct usb_serial *) urb->context;
if (urb->status) { if (status) {
dbg("%s - nonzero status: %x", __FUNCTION__, urb->status); dbg("%s - nonzero status: %x", __FUNCTION__, status);
return; return;
} }
...@@ -747,13 +751,14 @@ static void usa49_instat_callback(struct urb *urb) ...@@ -747,13 +751,14 @@ static void usa49_instat_callback(struct urb *urb)
struct usb_serial_port *port; struct usb_serial_port *port;
struct keyspan_port_private *p_priv; struct keyspan_port_private *p_priv;
int old_dcd_state; int old_dcd_state;
int status = urb->status;
dbg ("%s", __FUNCTION__); dbg ("%s", __FUNCTION__);
serial = (struct usb_serial *) urb->context; serial = (struct usb_serial *) urb->context;
if (urb->status) { if (status) {
dbg("%s - nonzero status: %x", __FUNCTION__, urb->status); dbg("%s - nonzero status: %x", __FUNCTION__, status);
return; return;
} }
...@@ -813,14 +818,15 @@ static void usa49_indat_callback(struct urb *urb) ...@@ -813,14 +818,15 @@ static void usa49_indat_callback(struct urb *urb)
struct usb_serial_port *port; struct usb_serial_port *port;
struct tty_struct *tty; struct tty_struct *tty;
unsigned char *data = urb->transfer_buffer; unsigned char *data = urb->transfer_buffer;
int status = urb->status;
dbg ("%s", __FUNCTION__); dbg ("%s", __FUNCTION__);
endpoint = usb_pipeendpoint(urb->pipe); endpoint = usb_pipeendpoint(urb->pipe);
if (urb->status) { if (status) {
dbg("%s - nonzero status: %x on endpoint %d.", __FUNCTION__, dbg("%s - nonzero status: %x on endpoint %d.", __FUNCTION__,
urb->status, endpoint); status, endpoint);
return; return;
} }
...@@ -865,13 +871,14 @@ static void usa49wg_indat_callback(struct urb *urb) ...@@ -865,13 +871,14 @@ static void usa49wg_indat_callback(struct urb *urb)
struct usb_serial_port *port; struct usb_serial_port *port;
struct tty_struct *tty; struct tty_struct *tty;
unsigned char *data = urb->transfer_buffer; unsigned char *data = urb->transfer_buffer;
int status = urb->status;
dbg ("%s", __FUNCTION__); dbg ("%s", __FUNCTION__);
serial = urb->context; serial = urb->context;
if (urb->status) { if (status) {
dbg("%s - nonzero status: %x", __FUNCTION__, urb->status); dbg("%s - nonzero status: %x", __FUNCTION__, status);
return; return;
} }
...@@ -948,14 +955,15 @@ static void usa90_indat_callback(struct urb *urb) ...@@ -948,14 +955,15 @@ static void usa90_indat_callback(struct urb *urb)
struct keyspan_port_private *p_priv; struct keyspan_port_private *p_priv;
struct tty_struct *tty; struct tty_struct *tty;
unsigned char *data = urb->transfer_buffer; unsigned char *data = urb->transfer_buffer;
int status = urb->status;
dbg ("%s", __FUNCTION__); dbg ("%s", __FUNCTION__);
endpoint = usb_pipeendpoint(urb->pipe); endpoint = usb_pipeendpoint(urb->pipe);
if (urb->status) { if (status) {
dbg("%s - nonzero status: %x on endpoint %d.", dbg("%s - nonzero status: %x on endpoint %d.",
__FUNCTION__, urb->status, endpoint); __FUNCTION__, status, endpoint);
return; return;
} }
...@@ -1021,11 +1029,12 @@ static void usa90_instat_callback(struct urb *urb) ...@@ -1021,11 +1029,12 @@ static void usa90_instat_callback(struct urb *urb)
struct usb_serial_port *port; struct usb_serial_port *port;
struct keyspan_port_private *p_priv; struct keyspan_port_private *p_priv;
int old_dcd_state, err; int old_dcd_state, err;
int status = urb->status;
serial = (struct usb_serial *) urb->context; serial = (struct usb_serial *) urb->context;
if (urb->status) { if (status) {
dbg("%s - nonzero status: %x", __FUNCTION__, urb->status); dbg("%s - nonzero status: %x", __FUNCTION__, status);
return; return;
} }
if (urb->actual_length < 14) { if (urb->actual_length < 14) {
...@@ -1088,13 +1097,14 @@ static void usa67_instat_callback(struct urb *urb) ...@@ -1088,13 +1097,14 @@ static void usa67_instat_callback(struct urb *urb)
struct usb_serial_port *port; struct usb_serial_port *port;
struct keyspan_port_private *p_priv; struct keyspan_port_private *p_priv;
int old_dcd_state; int old_dcd_state;
int status = urb->status;
dbg ("%s", __FUNCTION__); dbg ("%s", __FUNCTION__);
serial = urb->context; serial = urb->context;
if (urb->status) { if (status) {
dbg("%s - nonzero status: %x", __FUNCTION__, urb->status); dbg("%s - nonzero status: %x", __FUNCTION__, status);
return; return;
} }
......
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