linux/generic: fix a dynamic ingress_queue allocation on 2.6.37. http://patchwork...

[openwrt.git] / target / linux / etrax / files / drivers / usb / host / hc-crisv10.c

diff --git a/target/linux/etrax/files/drivers/usb/host/hc-crisv10.c b/target/linux/etrax/files/drivers/usb/host/hc-crisv10.c
index 28d9fae..34e54d9 100644 (file)
--- a/target/linux/etrax/files/drivers/usb/host/hc-crisv10.c
+++ b/target/linux/etrax/files/drivers/usb/host/hc-crisv10.c
@@ -33,7 +33,7 @@
 /***************************************************************************/
 /***************************************************************************/
 
 /***************************************************************************/
 /***************************************************************************/
 

-#define VERSION                        "1.00-openwrt_diff"
+#define VERSION                        "1.00-openwrt_diff-v1"

 #define COPYRIGHT              "(c) 2005, 2006 Axis Communications AB"
 #define DESCRIPTION             "ETRAX 100LX USB Host Controller"
 
 #define COPYRIGHT              "(c) 2005, 2006 Axis Communications AB"
 #define DESCRIPTION             "ETRAX 100LX USB Host Controller"
 


@@ -258,7 +258,6 @@ static inline void __dump_ep_list(int pipe_type)
       first_ep = &TxIsocEPList[0];
       break;
     default:
       first_ep = &TxIsocEPList[0];
       break;
     default:

-      warn("Cannot dump unknown traffic type");

       return;
     }
   ep = first_ep;
       return;
     }
   ep = first_ep;


@@ -843,7 +842,6 @@ void crisv10_hcd_epid_attn_irq(struct crisv10_irq_reg *reg) {
        /* We definitely don't care about these ones. Besides, they are
           always disabled, so any possible disabling caused by the
           epid attention interrupt is irrelevant. */
        /* We definitely don't care about these ones. Besides, they are
           always disabled, so any possible disabling caused by the
           epid attention interrupt is irrelevant. */

-       warn("Got epid_attn for INVALID_EPID or DUMMY_EPID (%d).", epid);

        continue;
       }
 
        continue;
       }
 


@@ -1037,8 +1035,8 @@ void crisv10_hcd_ctl_status_irq(struct crisv10_irq_reg *reg)
   DBFENTER;
   ASSERT(crisv10_hcd);
 
   DBFENTER;
   ASSERT(crisv10_hcd);
 

-  irq_dbg("ctr_status_irq, controller status: %s\n",
-         hcd_status_to_str(reg->r_usb_status));
+/*  irq_dbg("ctr_status_irq, controller status: %s\n",
+         hcd_status_to_str(reg->r_usb_status));*/

   
   /* FIXME: What should we do if we get ourun or perror? Dump the EP and SB
      list for the corresponding epid? */
   
   /* FIXME: What should we do if we get ourun or perror? Dump the EP and SB
      list for the corresponding epid? */


@@ -1082,9 +1080,6 @@ static inline void crisv10_ready_wait(void) {
   /* Check the busy bit of USB controller in Etrax */
   while((*R_USB_COMMAND & IO_MASK(R_USB_COMMAND, busy)) &&
        (timeout-- > 0));
   /* Check the busy bit of USB controller in Etrax */
   while((*R_USB_COMMAND & IO_MASK(R_USB_COMMAND, busy)) &&
        (timeout-- > 0));

-  if(timeout == 0) {
-    warn("Timeout while waiting for USB controller to be idle\n");
-  }

 }
 
 /* reset host controller */
 }
 
 /* reset host controller */


@@ -1630,9 +1625,7 @@ static void rh_disable_port(unsigned int port) {
   while((rh.wPortStatusPrev[port] &
        IO_STATE(R_USB_RH_PORT_STATUS_1, enabled, yes)) &&
        (timeout-- > 0));
   while((rh.wPortStatusPrev[port] &
        IO_STATE(R_USB_RH_PORT_STATUS_1, enabled, yes)) &&
        (timeout-- > 0));

-  if(timeout == 0) {
-    warn("Timeout while waiting for port %d to become disabled\n", port);
-  }
+

   /* clear disable flag in special register  */
   *usb_portx_disable = IO_STATE(R_USB_PORT1_DISABLE, disable, no);
   rh_info("Physical port %d disabled\n", port+1);
   /* clear disable flag in special register  */
   *usb_portx_disable = IO_STATE(R_USB_PORT1_DISABLE, disable, no);
   rh_info("Physical port %d disabled\n", port+1);


@@ -2149,10 +2142,7 @@ static void tc_sync_finish_epid(struct usb_hcd *hcd, int epid) {
       while((*R_DMA_CH8_SUB0_EP ==
             virt_to_phys(&TxBulkEPList[epid])) &&
            (timeout-- > 0));
       while((*R_DMA_CH8_SUB0_EP ==
             virt_to_phys(&TxBulkEPList[epid])) &&
            (timeout-- > 0));

-      if(timeout == 0) {
-       warn("Timeout while waiting for DMA-TX-Bulk to leave EP for"
-            " epid:%d\n", epid);
-      }
+

     }
     break;
 
     }
     break;
 


@@ -2167,10 +2157,6 @@ static void tc_sync_finish_epid(struct usb_hcd *hcd, int epid) {
       while((*R_DMA_CH8_SUB1_EP ==
             virt_to_phys(&TxCtrlEPList[epid])) &&
            (timeout-- > 0));
       while((*R_DMA_CH8_SUB1_EP ==
             virt_to_phys(&TxCtrlEPList[epid])) &&
            (timeout-- > 0));

-      if(timeout == 0) {
-       warn("Timeout while waiting for DMA-TX-Ctrl to leave EP for"
-            " epid:%d\n", epid);
-      }

     }
     break;
 
     }
     break;
 


@@ -2200,10 +2186,6 @@ static void tc_sync_finish_epid(struct usb_hcd *hcd, int epid) {
       
       while((*R_DMA_CH8_SUB3_EP == virt_to_phys(&TxIsocEPList[epid])) &&
            (timeout-- > 0));
       
       while((*R_DMA_CH8_SUB3_EP == virt_to_phys(&TxIsocEPList[epid])) &&
            (timeout-- > 0));

-      if(timeout == 0) {
-       warn("Timeout while waiting for DMA-TX-Isoc to leave EP for"
-            " epid:%d\n", epid);
-      }

     }
     break;
   }
     }
     break;
   }


@@ -2573,9 +2555,6 @@ static void tc_finish_isoc_urb(struct usb_hcd *hcd, struct urb *urb,
        /* Ah, the luxury of busy-wait. */
        while((*R_DMA_CH8_SUB3_EP == virt_to_phys(&TxIsocEPList[epid])) &&
              (timeout-- > 0));
        /* Ah, the luxury of busy-wait. */
        while((*R_DMA_CH8_SUB3_EP == virt_to_phys(&TxIsocEPList[epid])) &&
              (timeout-- > 0));

-       if(timeout == 0) {
-         warn("Timeout while waiting for DMA-TX-Isoc to leave EP for epid:%d\n", epid);
-       }

       }
 
       /* Unlink SB to say that epid is finished. */
       }
 
       /* Unlink SB to say that epid is finished. */


@@ -2954,9 +2933,6 @@ static void tc_free_epid(struct usb_host_endpoint *ep) {
   nop();
   while((*R_USB_EPT_DATA & IO_MASK(R_USB_EPT_DATA, hold)) &&
        (timeout-- > 0));
   nop();
   while((*R_USB_EPT_DATA & IO_MASK(R_USB_EPT_DATA, hold)) &&
        (timeout-- > 0));

-  if(timeout == 0) {
-    warn("Timeout while waiting for epid:%d to drop hold\n", epid);
-  }

   /* This will, among other things, set the valid field to 0. */
   *R_USB_EPT_DATA = 0;
   spin_unlock_irqrestore(&etrax_epid_lock, flags);
   /* This will, among other things, set the valid field to 0. */
   *R_USB_EPT_DATA = 0;
   spin_unlock_irqrestore(&etrax_epid_lock, flags);


@@ -4051,10 +4027,7 @@ static void tc_dma_unlink_intr_urb(struct urb *urb) {
       /* Wait until the DMA is no longer at this descriptor. */
       while((*R_DMA_CH8_SUB2_EP == virt_to_phys(unlink_ep)) &&
            (timeout-- > 0));
       /* Wait until the DMA is no longer at this descriptor. */
       while((*R_DMA_CH8_SUB2_EP == virt_to_phys(unlink_ep)) &&
            (timeout-- > 0));

-      if(timeout == 0) {
-       warn("Timeout while waiting for DMA-TX-Intr to leave unlink EP\n");
-      }
-      
+

       count++;
     }
     curr_ep = phys_to_virt(curr_ep->next);
       count++;
     }
     curr_ep = phys_to_virt(curr_ep->next);


@@ -4732,8 +4705,8 @@ static int __init_or_module devdrv_hcd_probe(struct device *dev)
               " needs to be 32\n");
     return -EPERM;
   }
               " needs to be 32\n");
     return -EPERM;
   }

-
-  hcd = usb_create_hcd(&crisv10_hc_driver, dev, dev->bus_id);
+  
+  hcd = usb_create_hcd(&crisv10_hc_driver, dev, dev_name(dev));

   if (!hcd)
     return -ENOMEM;
 
   if (!hcd)
     return -ENOMEM;
 


@@ -4983,3 +4956,4 @@ static void __exit module_hcd_exit(void)
 /* Module hooks */
 module_init(module_hcd_init);
 module_exit(module_hcd_exit);
 /* Module hooks */
 module_init(module_hcd_init);
 module_exit(module_hcd_exit);

+