Hi all,

Here's a patch that removes all of the USB_ST_* error #defines in the
2.5.1-pre5 kernel.  Let me know if anyone objects to this.

thanks,

greg k-h


diff -Nru a/drivers/isdn/hisax/st5481_b.c b/drivers/isdn/hisax/st5481_b.c
--- a/drivers/isdn/hisax/st5481_b.c     Thu Dec  6 15:45:33 2001
+++ b/drivers/isdn/hisax/st5481_b.c     Thu Dec  6 15:45:33 2001
@@ -168,7 +168,7 @@
        test_and_clear_bit(buf_nr, &b_out->busy);
 
        if (urb->status < 0) {
-               if (urb->status != USB_ST_URB_KILLED) {
+               if (urb->status != -ENOENT) {
                        WARN("urb status %d",urb->status);
                        if (b_out->busy == 0) {
                                st5481_usb_pipe_reset(adapter, (bcs->channel+1)*2 | 
USB_DIR_OUT, NULL, NULL);
diff -Nru a/drivers/isdn/hisax/st5481_d.c b/drivers/isdn/hisax/st5481_d.c
--- a/drivers/isdn/hisax/st5481_d.c     Thu Dec  6 15:45:33 2001
+++ b/drivers/isdn/hisax/st5481_d.c     Thu Dec  6 15:45:33 2001
@@ -382,7 +382,7 @@
        test_and_clear_bit(buf_nr, &d_out->busy);
 
        if (urb->status < 0) {
-               if (urb->status != USB_ST_URB_KILLED) {
+               if (urb->status != -ENOENT) {
                        WARN("urb status %d",urb->status);
                        if (d_out->busy == 0) {
                                st5481_usb_pipe_reset(adapter, EP_D_OUT | USB_DIR_OUT, 
fifo_reseted, adapter);
diff -Nru a/drivers/isdn/hisax/st5481_usb.c b/drivers/isdn/hisax/st5481_usb.c
--- a/drivers/isdn/hisax/st5481_usb.c   Thu Dec  6 15:45:33 2001
+++ b/drivers/isdn/hisax/st5481_usb.c   Thu Dec  6 15:45:33 2001
@@ -130,7 +130,7 @@
        struct ctrl_msg *ctrl_msg;
        
        if (urb->status < 0) {
-               if (urb->status != USB_ST_URB_KILLED) {
+               if (urb->status != -ENOENT) {
                        WARN("urb status %d",urb->status);
                } else {
                        DBG(1,"urb killed");
@@ -184,7 +184,7 @@
        int j;
 
        if (urb->status < 0) {
-               if (urb->status != USB_ST_URB_KILLED) {
+               if (urb->status != -ENOENT) {
                        WARN("urb status %d",urb->status);
                        urb->actual_length = 0;
                } else {
@@ -470,7 +470,7 @@
        int len, count, status;
 
        if (urb->status < 0) {
-               if (urb->status != USB_ST_URB_KILLED) {
+               if (urb->status != -ENOENT) {
                        WARN("urb status %d",urb->status);
                } else {
                        DBG(1,"urb killed");
diff -Nru a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c
--- a/drivers/net/irda/irda-usb.c       Thu Dec  6 15:45:33 2001
+++ b/drivers/net/irda/irda-usb.c       Thu Dec  6 15:45:33 2001
@@ -256,7 +256,7 @@
 
        /* Grab the speed URB */
        purb = &self->speed_urb;
-       if (purb->status != USB_ST_NOERROR) {
+       if (purb->status != 0) {
                WARNING(__FUNCTION__ "(), URB still in use!\n");
                return;
        }
@@ -301,7 +301,7 @@
        }
 
        /* Check for timeout and other USB nasties */
-       if(purb->status != USB_ST_NOERROR) {
+       if (purb->status != 0) {
                /* I get a lot of -ECONNABORTED = -103 here - Jean II */
                IRDA_DEBUG(0, __FUNCTION__ "(), URB complete status %d, transfer_flags 
0x%04X\n", purb->status, purb->transfer_flags);
 
@@ -314,7 +314,7 @@
        }
 
        /* urb is now available */
-       purb->status = USB_ST_NOERROR;
+       purb->status = 0;
 
        /* If it was the speed URB, allow the stack to send more packets */
        if(purb == &self->speed_urb) {
@@ -372,7 +372,7 @@
                }
        }
 
-       if (purb->status != USB_ST_NOERROR) {
+       if (purb->status != 0) {
                WARNING(__FUNCTION__ "(), URB still in use!\n");
                dev_kfree_skb(skb);
                return 0;
@@ -490,7 +490,7 @@
        purb->context = NULL;
 
        /* Check for timeout and other USB nasties */
-       if(purb->status != USB_ST_NOERROR) {
+       if (purb->status != 0) {
                /* I get a lot of -ECONNABORTED = -103 here - Jean II */
                IRDA_DEBUG(0, __FUNCTION__ "(), URB complete status %d, transfer_flags 
0x%04X\n", purb->status, purb->transfer_flags);
 
@@ -504,7 +504,7 @@
        }
 
        /* urb is now available */
-       purb->status = USB_ST_NOERROR;
+       purb->status = 0;
 
        /* If the network is closed, stop everything */
        if ((!self->netopen) || (!self->present)) {
@@ -547,11 +547,11 @@
 
        /* Check speed URB */
        purb = &(self->speed_urb);
-       if (purb->status != USB_ST_NOERROR) {
+       if (purb->status != 0) {
                IRDA_DEBUG(0, "%s: Speed change timed out, urb->status=%d, 
urb->transfer_flags=0x%04X\n", netdev->name, purb->status, purb->transfer_flags);
 
                switch (purb->status) {
-               case USB_ST_URB_PENDING:        /* -EINPROGRESS == -115 */
+               case -EINPROGRESS:
                        usb_unlink_urb(purb);
                        /* Note : above will  *NOT* call netif_wake_queue()
                         * in completion handler, we will come back here.
@@ -563,7 +563,7 @@
                case -ETIMEDOUT:                /* -110 */
                case -ENOENT:                   /* -2 (urb unlinked by us)  */
                default:                        /* ??? - Play safe */
-                       purb->status = USB_ST_NOERROR;
+                       purb->status = 0;
                        netif_wake_queue(self->netdev);
                        done = 1;
                        break;
@@ -572,7 +572,7 @@
 
        /* Check Tx URB */
        purb = &(self->tx_urb);
-       if (purb->status != USB_ST_NOERROR) {
+       if (purb->status != 0) {
                struct sk_buff *skb = purb->context;
 
                IRDA_DEBUG(0, "%s: Tx timed out, urb->status=%d, 
urb->transfer_flags=0x%04X\n", netdev->name, purb->status, purb->transfer_flags);
@@ -590,7 +590,7 @@
 #endif /* IU_BUG_KICK_TIMEOUT */
 
                switch (purb->status) {
-               case USB_ST_URB_PENDING:        /* -EINPROGRESS == -115 */
+               case -EINPROGRESS:
                        usb_unlink_urb(purb);
                        /* Note : above will  *NOT* call netif_wake_queue()
                         * in completion handler, because purb->status will
@@ -610,7 +610,7 @@
                                dev_kfree_skb_any(skb);
                                purb->context = NULL;
                        }
-                       purb->status = USB_ST_NOERROR;
+                       purb->status = 0;
                        netif_wake_queue(self->netdev);
                        done = 1;
                        break;
@@ -727,7 +727,7 @@
        purb->transfer_flags = USB_QUEUE_BULK;
        /* Note : unlink *must* be synchronous because of the code in 
         * irda_usb_net_close() -> free the skb - Jean II */
-       purb->status = USB_ST_NOERROR;
+       purb->status = 0;
        purb->next = NULL;      /* Don't auto resubmit URBs */
        
        ret = usb_submit_urb(purb);
@@ -768,9 +768,9 @@
        }
        
        /* Check the status */
-       if(purb->status != USB_ST_NOERROR) {
+       if (purb->status != 0) {
                switch (purb->status) {
-               case USB_ST_CRC:                /* -EILSEQ */
+               case -EILSEQ:
                        self->stats.rx_errors++;
                        self->stats.rx_crc_errors++;    
                        break;
@@ -1442,9 +1442,9 @@
        ret = usb_set_interface(dev, ifnum, 0);
        IRDA_DEBUG(1, "usb-irda: set interface %d result %d\n", ifnum, ret);
        switch (ret) {
-               case USB_ST_NOERROR:            /* 0 */
+               case 0:
                        break;
-               case USB_ST_STALL:              /* -EPIPE = -32 */
+               case -EPIPE:            /* -EPIPE = -32 */
                        usb_clear_halt(dev, usb_sndctrlpipe(dev, 0));
                        IRDA_DEBUG(0, __FUNCTION__ "(), Clearing stall on control 
interface\n" );
                        break;
diff -Nru a/drivers/usb/CDCEther.c b/drivers/usb/CDCEther.c
--- a/drivers/usb/CDCEther.c    Thu Dec  6 15:45:33 2001
+++ b/drivers/usb/CDCEther.c    Thu Dec  6 15:45:33 2001
@@ -82,9 +82,9 @@
        ether_dev->flags |= CDC_ETHER_RX_BUSY;
 
        switch ( urb->status ) {
-               case USB_ST_NOERROR:
+               case 0:
                        break;
-               case USB_ST_NORESPONSE:
+               case -ETIMEDOUT:
                        dbg( "no repsonse in BULK IN" );
                        ether_dev->flags &= ~CDC_ETHER_RX_BUSY;
                        break;
@@ -179,9 +179,9 @@
 //             return;
 //             
 //     switch ( urb->status ) {
-//             case USB_ST_NOERROR:
+//             case 0:
 //                     break;
-//             case USB_ST_URB_KILLED:
+//             case -ENOENT:
 //                     return;
 //             default:
 //                     info("intr status %d", urb->status);
diff -Nru a/drivers/usb/audio.c b/drivers/usb/audio.c
--- a/drivers/usb/audio.c       Thu Dec  6 15:45:33 2001
+++ b/drivers/usb/audio.c       Thu Dec  6 15:45:33 2001
@@ -899,7 +899,7 @@
        struct usbin *u = &as->usbin;
        unsigned long flags;
        unsigned int mask;
-       int suret = USB_ST_NOERROR;
+       int suret = 0;
 
 #if 0
        printk(KERN_DEBUG "usbin_completed: status %d errcnt %d flags 0x%x\n", 
urb->status, urb->error_count, u->flags);
@@ -917,7 +917,7 @@
        if (!usbin_retire_desc(u, urb) &&
            u->flags & FLG_RUNNING &&
            !usbin_prepare_desc(u, urb) && 
-           (suret = usb_submit_urb(urb)) == USB_ST_NOERROR) {
+           (suret = usb_submit_urb(urb)) == 0) {
                u->flags |= mask;
        } else {
                u->flags &= ~(mask | FLG_RUNNING);
@@ -964,7 +964,7 @@
        struct usbin *u = &as->usbin;
        unsigned long flags;
        unsigned int mask;
-       int suret = USB_ST_NOERROR;
+       int suret = 0;
 
 #if 0
        printk(KERN_DEBUG "usbin_sync_completed: status %d errcnt %d flags 0x%x\n", 
urb->status, urb->error_count, u->flags);
@@ -982,7 +982,7 @@
        if (!usbin_sync_retire_desc(u, urb) &&
            u->flags & FLG_RUNNING &&
            !usbin_sync_prepare_desc(u, urb) && 
-           (suret = usb_submit_urb(urb)) == USB_ST_NOERROR) {
+           (suret = usb_submit_urb(urb)) == 0) {
                u->flags |= mask;
        } else {
                u->flags &= ~(mask | FLG_RUNNING);
@@ -1257,7 +1257,7 @@
        struct usbout *u = &as->usbout;
        unsigned long flags;
        unsigned int mask;
-       int suret = USB_ST_NOERROR;
+       int suret = 0;
 
 #if 0
        printk(KERN_DEBUG "usbout_completed: status %d errcnt %d flags 0x%x\n", 
urb->status, urb->error_count, u->flags);
@@ -1275,7 +1275,7 @@
        if (!usbout_retire_desc(u, urb) &&
            u->flags & FLG_RUNNING &&
            !usbout_prepare_desc(u, urb) && 
-           (suret = usb_submit_urb(urb)) == USB_ST_NOERROR) {
+           (suret = usb_submit_urb(urb)) == 0) {
                u->flags |= mask;
        } else {
                u->flags &= ~(mask | FLG_RUNNING);
@@ -1329,7 +1329,7 @@
        struct usbout *u = &as->usbout;
        unsigned long flags;
        unsigned int mask;
-       int suret = USB_ST_NOERROR;
+       int suret = 0;
 
 #if 0
        printk(KERN_DEBUG "usbout_sync_completed: status %d errcnt %d flags 0x%x\n", 
urb->status, urb->error_count, u->flags);
@@ -1347,7 +1347,7 @@
        if (!usbout_sync_retire_desc(u, urb) &&
            u->flags & FLG_RUNNING &&
            !usbout_sync_prepare_desc(u, urb) && 
-           (suret = usb_submit_urb(urb)) == USB_ST_NOERROR) {
+           (suret = usb_submit_urb(urb)) == 0) {
                u->flags |= mask;
        } else {
                u->flags &= ~(mask | FLG_RUNNING);
diff -Nru a/drivers/usb/dc2xx.c b/drivers/usb/dc2xx.c
--- a/drivers/usb/dc2xx.c       Thu Dec  6 15:45:33 2001
+++ b/drivers/usb/dc2xx.c       Thu Dec  6 15:45:33 2001
@@ -199,7 +199,7 @@
                                retval = count;
                        break;
                }
-               if (retval != USB_ST_TIMEOUT)
+               if (retval != -ETIMEDOUT)
                        break;
                interruptible_sleep_on_timeout (&camera->wait, RETRY_TIMEOUT);
 
@@ -267,7 +267,7 @@
                        } else if (!result)
                                break;
                                
-                       if (result == USB_ST_TIMEOUT) { /* NAK - delay a bit */
+                       if (result == -ETIMEDOUT) {     /* NAK - delay a bit */
                                if (!maxretry--) {
                                        if (!bytes_written)
                                                bytes_written = -ETIME;
diff -Nru a/drivers/usb/devio.c b/drivers/usb/devio.c
--- a/drivers/usb/devio.c       Thu Dec  6 15:45:33 2001
+++ b/drivers/usb/devio.c       Thu Dec  6 15:45:33 2001
@@ -276,7 +276,7 @@
                 list_del(&as->asynclist);
                 INIT_LIST_HEAD(&as->asynclist);
                 spin_unlock_irqrestore(&ps->lock, flags);
-                /* usb_unlink_urb calls the completion handler with status == 
USB_ST_URB_KILLED */
+                /* usb_unlink_urb calls the completion handler with status == -ENOENT 
+*/
                 usb_unlink_urb(&as->urb);
                 spin_lock_irqsave(&ps->lock, flags);
         }
diff -Nru a/drivers/usb/pegasus.c b/drivers/usb/pegasus.c
--- a/drivers/usb/pegasus.c     Thu Dec  6 15:45:33 2001
+++ b/drivers/usb/pegasus.c     Thu Dec  6 15:45:33 2001
@@ -102,7 +102,7 @@
                return;
 
        switch ( urb->status ) {
-               case USB_ST_NOERROR:
+               case 0:
                        if ( pegasus->flags & ETH_REGS_CHANGE ) {
                                pegasus->flags &= ~ETH_REGS_CHANGE;
                                pegasus->flags |= ETH_REGS_CHANGED;
@@ -110,9 +110,9 @@
                                return;
                        }
                        break;
-               case USB_ST_URB_PENDING:
+               case -EINPROGRESS:
                        return;
-               case USB_ST_URB_KILLED:
+               case -ENOENT:
                        break;
                default:
                        warn( __FUNCTION__ " status %d", urb->status);
@@ -526,9 +526,9 @@
        pegasus->flags |= PEGASUS_RX_BUSY;
 
        switch ( urb->status ) {
-               case USB_ST_NOERROR:
+               case 0:
                        break;
-               case USB_ST_NORESPONSE:
+               case -ETIMEDOUT:
                        dbg( "reset MAC" );
                        pegasus->flags &= ~PEGASUS_RX_BUSY;
                        break;
@@ -607,9 +607,9 @@
                return;
                
        switch ( urb->status ) {
-               case USB_ST_NOERROR:
+               case 0:
                        break;
-               case USB_ST_URB_KILLED:
+               case -ENOENT:
                        return;
                default:
                        info("intr status %d", urb->status);
diff -Nru a/drivers/usb/rio500.c b/drivers/usb/rio500.c
--- a/drivers/usb/rio500.c      Thu Dec  6 15:45:33 2001
+++ b/drivers/usb/rio500.c      Thu Dec  6 15:45:33 2001
@@ -324,7 +324,7 @@
                        dbg("write stats: result:%d thistime:%lu partial:%u",
                             result, thistime, partial);
 
-                       if (result == USB_ST_TIMEOUT) { /* NAK - so hold for a while */
+                       if (result == -ETIMEDOUT) {     /* NAK - so hold for a while */
                                if (!maxretry--) {
                                        errn = -ETIME;
                                        goto error;
@@ -403,7 +403,7 @@
 
                if (partial) {
                        count = this_read = partial;
-               } else if (result == USB_ST_TIMEOUT || result == 15) {  /* FIXME: 15 
??? */
+               } else if (result == -ETIMEDOUT || result == 15) {      /* FIXME: 15 
+??? */
                        if (!maxretry--) {
                                up(&(rio->lock));
                                err("read_rio: maxretry timeout");
@@ -412,7 +412,7 @@
                        interruptible_sleep_on_timeout(&rio->wait_q,
                                                       NAK_TIMEOUT);
                        continue;
-               } else if (result != USB_ST_DATAUNDERRUN) {
+               } else if (result != -EREMOTEIO) {
                        up(&(rio->lock));
                        err("Read Whoops - result:%u partial:%u this_read:%u",
                             result, partial, this_read);
diff -Nru a/drivers/usb/scanner.c b/drivers/usb/scanner.c
--- a/drivers/usb/scanner.c     Thu Dec  6 15:45:33 2001
+++ b/drivers/usb/scanner.c     Thu Dec  6 15:45:33 2001
@@ -628,7 +628,7 @@
                        }
                        ret = result;
                        break;
-               } else if ((result < 0) && (result != USB_ST_DATAUNDERRUN)) {
+               } else if ((result < 0) && (result != -EREMOTEIO)) {
                        warn("read_scanner(%d): funky result:%d. Consult 
Documentation/usb/scanner.txt.", scn_minor, (int)result);
                        ret = -EIO;
                        break;
diff -Nru a/drivers/usb/usb-ohci.c b/drivers/usb/usb-ohci.c
--- a/drivers/usb/usb-ohci.c    Thu Dec  6 15:45:33 2001
+++ b/drivers/usb/usb-ohci.c    Thu Dec  6 15:45:33 2001
@@ -485,7 +485,7 @@
 
                        /* implicitly requeued */
                        urb->actual_length = 0;
-                       urb->status = USB_ST_URB_PENDING;
+                       urb->status = -EINPROGRESS;
                        if (urb_priv->state != URB_DEL)
                                td_submit_urb (urb);
                        break;
@@ -502,7 +502,7 @@
                                urb->complete (urb);
                                spin_lock_irqsave (&usb_ed_lock, flags);
                                urb->actual_length = 0;
-                               urb->status = USB_ST_URB_PENDING;
+                               urb->status = -EINPROGRESS;
                                urb->start_frame = urb_priv->ed->last_iso + 1;
                                if (urb_priv->state != URB_DEL) {
                                        for (i = 0; i < urb->number_of_packets; i++) {
@@ -673,7 +673,7 @@
 
        urb->actual_length = 0;
        urb->hcpriv = urb_priv;
-       urb->status = USB_ST_URB_PENDING;
+       urb->status = -EINPROGRESS;
 
        /* link the ed into a chain if is not already */
        if (ed->state != ED_OPER)
@@ -737,7 +737,7 @@
        if (usb_pipedevice (urb->pipe) == ohci->rh.devnum)
                return rh_unlink_urb (urb);
 
-       if (urb->hcpriv && (urb->status == USB_ST_URB_PENDING)) { 
+       if (urb->hcpriv && (urb->status == -EINPROGRESS)) { 
                if (!ohci->disabled) {
                        urb_priv_t  * urb_priv;
 
@@ -777,11 +777,11 @@
 
                                /* wait until all TDs are deleted */
                                set_current_state(TASK_UNINTERRUPTIBLE);
-                               while (timeout && (urb->status == USB_ST_URB_PENDING))
+                               while (timeout && (urb->status == -EINPROGRESS))
                                        timeout = schedule_timeout (timeout);
                                set_current_state(TASK_RUNNING);
                                remove_wait_queue (&unlink_wakeup, &wait); 
-                               if (urb->status == USB_ST_URB_PENDING) {
+                               if (urb->status == -EINPROGRESS) {
                                        err ("unlink URB timeout");
                                        return -ETIMEDOUT;
                                }
diff -Nru a/drivers/usb/usb-ohci.h b/drivers/usb/usb-ohci.h
--- a/drivers/usb/usb-ohci.h    Thu Dec  6 15:45:33 2001
+++ b/drivers/usb/usb-ohci.h    Thu Dec  6 15:45:33 2001
@@ -11,22 +11,22 @@
 static int cc_to_error[16] = { 
 
 /* mapping of the OHCI CC status to error codes */ 
-       /* No  Error  */               USB_ST_NOERROR,
-       /* CRC Error  */               USB_ST_CRC,
-       /* Bit Stuff  */               USB_ST_BITSTUFF,
-       /* Data Togg  */               USB_ST_CRC,
-       /* Stall      */               USB_ST_STALL,
-       /* DevNotResp */               USB_ST_NORESPONSE,
-       /* PIDCheck   */               USB_ST_BITSTUFF,
-       /* UnExpPID   */               USB_ST_BITSTUFF,
-       /* DataOver   */               USB_ST_DATAOVERRUN,
-       /* DataUnder  */               USB_ST_DATAUNDERRUN,
-       /* reservd    */               USB_ST_NORESPONSE,
-       /* reservd    */               USB_ST_NORESPONSE,
-       /* BufferOver */               USB_ST_BUFFEROVERRUN,
-       /* BuffUnder  */               USB_ST_BUFFERUNDERRUN,
-       /* Not Access */               USB_ST_NORESPONSE,
-       /* Not Access */               USB_ST_NORESPONSE 
+       /* No  Error  */        0,
+       /* CRC Error  */        -EILSEQ,
+       /* Bit Stuff  */        -EPROTO,
+       /* Data Togg  */        -EILSEQ,
+       /* Stall      */        -EPIPE,
+       /* DevNotResp */        -ETIMEDOUT,
+       /* PIDCheck   */        -EPROTO,
+       /* UnExpPID   */        -EPROTO,
+       /* DataOver   */        -EOVERFLOW,
+       /* DataUnder  */        -EREMOTEIO,
+       /* reservd    */        -ETIMEDOUT,
+       /* reservd    */        -ETIMEDOUT,
+       /* BufferOver */        -ECOMM,
+       /* BuffUnder  */        -ENOSR,
+       /* Not Access */        -ETIMEDOUT,
+       /* Not Access */        -ETIMEDOUT 
 };
 
 #include <linux/config.h>
diff -Nru a/drivers/usb/usb.c b/drivers/usb/usb.c
--- a/drivers/usb/usb.c Thu Dec  6 15:45:33 2001
+++ b/drivers/usb/usb.c Thu Dec  6 15:45:33 2001
@@ -292,7 +292,7 @@
  * bustime is from calc_bus_time(), but converted to microseconds.
  *
  * returns <bustime in us> if successful,
- * or USB_ST_BANDWIDTH_ERROR if bandwidth request fails.
+ * or -ENOSPC if bandwidth request fails.
  *
  * FIXME:
  * This initial implementation does not use Endpoint.bInterval
@@ -333,7 +333,7 @@
 
        if (!usb_bandwidth_option)      /* don't enforce it */
                return (bustime);
-       return (new_alloc <= FRAME_TIME_MAX_USECS_ALLOC) ? bustime : 
USB_ST_BANDWIDTH_ERROR;
+       return (new_alloc <= FRAME_TIME_MAX_USECS_ALLOC) ? bustime : -ENOSPC;
 }
 
 void usb_claim_bandwidth (struct usb_device *dev, struct urb *urb, int bustime, int 
isoc)
diff -Nru a/drivers/usb/usbnet.c b/drivers/usb/usbnet.c
--- a/drivers/usb/usbnet.c      Thu Dec  6 15:45:33 2001
+++ b/drivers/usb/usbnet.c      Thu Dec  6 15:45:33 2001
@@ -1535,7 +1535,7 @@
        struct skb_data         *entry = (struct skb_data *) skb->cb;
        struct usbnet           *dev = entry->dev;
 
-       if (urb->status == USB_ST_STALL) {
+       if (urb->status == -EPIPE) {
                if (dev->ctrl_task.sync == 0) {
                        dev->ctrl_task.routine = tx_clear_halt;
                        dev->ctrl_task.data = dev;
diff -Nru a/drivers/usb/uss720.c b/drivers/usb/uss720.c
--- a/drivers/usb/uss720.c      Thu Dec  6 15:45:33 2001
+++ b/drivers/usb/uss720.c      Thu Dec  6 15:45:33 2001
@@ -193,7 +193,7 @@
        struct parport *pp = (struct parport *)dev_id;
        struct parport_uss720_private *priv = pp->private_data; 
 
-       if (usbstatus != USB_ST_NOERROR || len < 4 || !buffer)
+       if (usbstatus != 0 || len < 4 || !buffer)
                return 1;
        memcpy(priv->reg, buffer, 4);
        /* if nAck interrupts are enabled and we have an interrupt, call the interrupt 
procedure */
diff -Nru a/include/linux/usb.h b/include/linux/usb.h
--- a/include/linux/usb.h       Thu Dec  6 15:45:33 2001
+++ b/include/linux/usb.h       Thu Dec  6 15:45:33 2001
@@ -126,34 +126,6 @@
 } devrequest __attribute__ ((packed));
 
 /*
- * USB-status codes:
- * USB_ST* maps to -E* and should go away in the future
- */
-
-// FIXME 2.5 get rid of these
-
-#define USB_ST_NOERROR         0
-#define USB_ST_CRC             (-EILSEQ)
-#define USB_ST_BITSTUFF                (-EPROTO)
-#define USB_ST_NORESPONSE      (-ETIMEDOUT)                    /* device not 
responding/handshaking */
-#define USB_ST_DATAOVERRUN     (-EOVERFLOW)
-#define USB_ST_DATAUNDERRUN    (-EREMOTEIO)
-#define USB_ST_BUFFEROVERRUN   (-ECOMM)
-#define USB_ST_BUFFERUNDERRUN  (-ENOSR)
-#define USB_ST_INTERNALERROR   (-EPROTO)                       /* unknown error */
-#define USB_ST_SHORT_PACKET            (-EREMOTEIO)
-#define USB_ST_PARTIAL_ERROR   (-EXDEV)                        /* ISO transfer only 
partially completed */
-#define USB_ST_URB_KILLED      (-ENOENT)                       /* URB canceled by 
user */
-#define USB_ST_URB_PENDING       (-EINPROGRESS)
-#define USB_ST_REMOVED         (-ENODEV)                       /* device not existing 
or removed */
-#define USB_ST_TIMEOUT         (-ETIMEDOUT)                    /* communication timed 
out, also in urb->status**/
-#define USB_ST_NOTSUPPORTED    (-ENOSYS)                       
-#define USB_ST_BANDWIDTH_ERROR (-ENOSPC)                       /* too much bandwidth 
used */
-#define USB_ST_URB_INVALID_ERROR  (-EINVAL)                    /* invalid 
value/transfer type */
-#define USB_ST_URB_REQUEST_ERROR  (-ENXIO)                     /* invalid endpoint */
-#define USB_ST_STALL           (-EPIPE)                        /* pipe stalled, also 
in urb->status*/
-
-/*
  * USB device number allocation bitmap. There's one bitmap
  * per USB tree.
  */

_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel

Reply via email to