vserver 1.9.5.x5

[linux-2.6.git] / drivers / usb / host / hc_crisv10.c

diff --git a/drivers/usb/host/hc_crisv10.c b/drivers/usb/host/hc_crisv10.c
index 770c870..4b12be8 100644 (file)
--- a/drivers/usb/host/hc_crisv10.c
+++ b/drivers/usb/host/hc_crisv10.c
@@ -113,17 +113,17 @@ static __u8 root_hub_dev_des[] =
 {
        0x12,  /*  __u8  bLength; */
        0x01,  /*  __u8  bDescriptorType; Device */
-       0x00,  /*  __u16 bcdUSB; v1.0 */
+       0x00,  /*  __le16 bcdUSB; v1.0 */
        0x01,
        0x09,  /*  __u8  bDeviceClass; HUB_CLASSCODE */
        0x00,  /*  __u8  bDeviceSubClass; */
        0x00,  /*  __u8  bDeviceProtocol; */
        0x08,  /*  __u8  bMaxPacketSize0; 8 Bytes */
-       0x00,  /*  __u16 idVendor; */
+       0x00,  /*  __le16 idVendor; */
        0x00,
-       0x00,  /*  __u16 idProduct; */
+       0x00,  /*  __le16 idProduct; */
        0x00,
-       0x00,  /*  __u16 bcdDevice; */
+       0x00,  /*  __le16 bcdDevice; */
        0x00,
        0x00,  /*  __u8  iManufacturer; */
        0x02,  /*  __u8  iProduct; */
@@ -136,7 +136,7 @@ static __u8 root_hub_config_des[] =
 {
        0x09,  /*  __u8  bLength; */
        0x02,  /*  __u8  bDescriptorType; Configuration */
-       0x19,  /*  __u16 wTotalLength; */
+       0x19,  /*  __le16 wTotalLength; */
        0x00,
        0x01,  /*  __u8  bNumInterfaces; */
        0x01,  /*  __u8  bConfigurationValue; */
@@ -160,7 +160,7 @@ static __u8 root_hub_config_des[] =
        0x05,  /*  __u8  ep_bDescriptorType; Endpoint */
        0x81,  /*  __u8  ep_bEndpointAddress; IN Endpoint 1 */
        0x03,  /*  __u8  ep_bmAttributes; Interrupt */
-       0x08,  /*  __u16 ep_wMaxPacketSize; 8 Bytes */
+       0x08,  /*  __le16 ep_wMaxPacketSize; 8 Bytes */
        0x00,
        0xff   /*  __u8  ep_bInterval; 255 ms */
 };
@@ -479,8 +479,6 @@ static int etrax_usb_submit_isoc_urb(struct urb *urb);
 static int etrax_usb_submit_urb(struct urb *urb, int mem_flags);
 static int etrax_usb_unlink_urb(struct urb *urb, int status);
 static int etrax_usb_get_frame_number(struct usb_device *usb_dev);
-static int etrax_usb_allocate_dev(struct usb_device *usb_dev);
-static int etrax_usb_deallocate_dev(struct usb_device *usb_dev);
 
 static irqreturn_t etrax_usb_tx_interrupt(int irq, void *vhc, struct pt_regs *regs);
 static irqreturn_t etrax_usb_rx_interrupt(int irq, void *vhc, struct pt_regs *regs);
@@ -512,8 +510,6 @@ static void etrax_usb_hc_cleanup(void);
 
 static struct usb_operations etrax_usb_device_operations =
 {
-       .allocate = etrax_usb_allocate_dev,
-       .deallocate = etrax_usb_deallocate_dev,
        .get_frame_number = etrax_usb_get_frame_number,
        .submit_urb = etrax_usb_submit_urb,
        .unlink_urb = etrax_usb_unlink_urb,
@@ -1579,20 +1575,6 @@ static int etrax_usb_get_frame_number(struct usb_device *usb_dev)
        return (*R_USB_FM_NUMBER & 0x7ff);
 }
 
-static int etrax_usb_allocate_dev(struct usb_device *usb_dev)
-{
-       DBFENTER;
-       DBFEXIT;
-       return 0;
-}
-
-static int etrax_usb_deallocate_dev(struct usb_device *usb_dev)
-{
-       DBFENTER;
-       DBFEXIT;
-       return 0;
-}
-
 static irqreturn_t etrax_usb_tx_interrupt(int irq, void *vhc, struct pt_regs *regs)
 {
        DBFENTER;
@@ -4546,7 +4528,7 @@ static int __init etrax_usb_hc_init(void)
         usb_rh->speed = USB_SPEED_FULL;
         usb_rh->devnum = 1;
         hc->bus->devnum_next = 2;
-        usb_rh->epmaxpacketin[0] = usb_rh->epmaxpacketout[0] = 64;
+        usb_rh->ep0.desc.wMaxPacketSize = __const_cpu_to_le16(64);
         usb_get_device_descriptor(usb_rh, USB_DT_DEVICE_SIZE);
        usb_new_device(usb_rh);