mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 01:49:36 +00:00
USB: misc: auerswald: 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. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
13f9782d8e
commit
22bea334c9
1 changed files with 15 additions and 10 deletions
|
@ -862,14 +862,16 @@ static void auerswald_ctrlread_wretcomplete (struct urb * urb)
|
|||
pauerbuf_t bp = (pauerbuf_t) urb->context;
|
||||
pauerswald_t cp;
|
||||
int ret;
|
||||
int status = urb->status;
|
||||
|
||||
dbg ("auerswald_ctrlread_wretcomplete called");
|
||||
dbg ("complete with status: %d", urb->status);
|
||||
dbg ("complete with status: %d", status);
|
||||
cp = ((pauerswald_t)((char *)(bp->list)-(unsigned long)(&((pauerswald_t)0)->bufctl)));
|
||||
|
||||
/* check if it is possible to advance */
|
||||
if (!auerswald_status_retry (urb->status) || !cp->usbdev) {
|
||||
if (!auerswald_status_retry(status) || !cp->usbdev) {
|
||||
/* reuse the buffer */
|
||||
err ("control dummy: transmission error %d, can not retry", urb->status);
|
||||
err ("control dummy: transmission error %d, can not retry", status);
|
||||
auerbuf_releasebuf (bp);
|
||||
/* Wake up all processes waiting for a buffer */
|
||||
wake_up (&cp->bufferwait);
|
||||
|
@ -902,21 +904,23 @@ static void auerswald_ctrlread_complete (struct urb * urb)
|
|||
pauerswald_t cp;
|
||||
pauerscon_t scp;
|
||||
pauerbuf_t bp = (pauerbuf_t) urb->context;
|
||||
int status = urb->status;
|
||||
int ret;
|
||||
|
||||
dbg ("auerswald_ctrlread_complete called");
|
||||
|
||||
cp = ((pauerswald_t)((char *)(bp->list)-(unsigned long)(&((pauerswald_t)0)->bufctl)));
|
||||
|
||||
/* check if there is valid data in this urb */
|
||||
if (urb->status) {
|
||||
dbg ("complete with non-zero status: %d", urb->status);
|
||||
if (status) {
|
||||
dbg ("complete with non-zero status: %d", status);
|
||||
/* should we do a retry? */
|
||||
if (!auerswald_status_retry (urb->status)
|
||||
if (!auerswald_status_retry(status)
|
||||
|| !cp->usbdev
|
||||
|| (cp->version < AUV_RETRY)
|
||||
|| (bp->retries >= AU_RETRIES)) {
|
||||
/* reuse the buffer */
|
||||
err ("control read: transmission error %d, can not retry", urb->status);
|
||||
err ("control read: transmission error %d, can not retry", status);
|
||||
auerbuf_releasebuf (bp);
|
||||
/* Wake up all processes waiting for a buffer */
|
||||
wake_up (&cp->bufferwait);
|
||||
|
@ -974,12 +978,13 @@ static void auerswald_int_complete (struct urb * urb)
|
|||
unsigned int channelid;
|
||||
unsigned int bytecount;
|
||||
int ret;
|
||||
int status = urb->status;
|
||||
pauerbuf_t bp = NULL;
|
||||
pauerswald_t cp = (pauerswald_t) urb->context;
|
||||
|
||||
dbg ("%s called", __FUNCTION__);
|
||||
|
||||
switch (urb->status) {
|
||||
switch (status) {
|
||||
case 0:
|
||||
/* success */
|
||||
break;
|
||||
|
@ -987,10 +992,10 @@ static void auerswald_int_complete (struct urb * urb)
|
|||
case -ENOENT:
|
||||
case -ESHUTDOWN:
|
||||
/* 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__, status);
|
||||
return;
|
||||
default:
|
||||
dbg("%s - nonzero urb status received: %d", __FUNCTION__, urb->status);
|
||||
dbg("%s - nonzero urb status received: %d", __FUNCTION__, status);
|
||||
goto exit;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue