power: change from meaningless value to error number

[u-boot] / drivers / usb / host / ohci-s3c24xx.c

diff --git a/drivers/usb/host/ohci-s3c24xx.c b/drivers/usb/host/ohci-s3c24xx.c
index 879ac166242e3a2c802bfd9090ebb2561fb3261f..28b9ab51769013cbc1c8967dc586ba0c04b57dda 100644 (file)
--- a/drivers/usb/host/ohci-s3c24xx.c
+++ b/drivers/usb/host/ohci-s3c24xx.c
@@ -35,9 +35,6 @@
 #define        OHCI_CONTROL_INIT \
        (OHCI_CTRL_CBSR & 0x3) | OHCI_CTRL_IE | OHCI_CTRL_PLE
 
-#define min_t(type, x, y) \
-       ({ type __x = (x); type __y = (y); __x < __y ? __x : __y; })
-
 #undef DEBUG
 #ifdef DEBUG
 #define dbg(format, arg...) printf("DEBUG: " format "\n", ## arg)
@@ -680,7 +677,7 @@ static void td_submit_job(struct usb_device *dev, unsigned long pipe,
        unsigned int toggle = 0;
 
        /* OHCI handles the DATA-toggles itself, we just
-          use the USB-toggle bits for reseting */
+          use the USB-toggle bits for resetting */
        if (usb_gettoggle(dev, usb_pipeendpoint(pipe), usb_pipeout(pipe))) {
                toggle = TD_T_TOGGLE;
        } else {
@@ -873,100 +870,7 @@ static int dl_done_list(struct ohci *ohci, struct td *td_list)
  * Virtual Root Hub
  *-------------------------------------------------------------------------*/
 
-/* Device descriptor */
-static __u8 root_hub_dev_des[] = {
-       0x12,   /*  __u8  bLength; */
-       0x01,   /*  __u8  bDescriptorType; Device */
-       0x10,   /*  __u16 bcdUSB; v1.1 */
-       0x01,
-       0x09,   /*  __u8  bDeviceClass; HUB_CLASSCODE */
-       0x00,   /*  __u8  bDeviceSubClass; */
-       0x00,   /*  __u8  bDeviceProtocol; */
-       0x08,   /*  __u8  bMaxPacketSize0; 8 Bytes */
-       0x00,   /*  __u16 idVendor; */
-       0x00,
-       0x00,   /*  __u16 idProduct; */
-       0x00,
-       0x00,   /*  __u16 bcdDevice; */
-       0x00,
-       0x00,   /*  __u8  iManufacturer; */
-       0x01,   /*  __u8  iProduct; */
-       0x00,   /*  __u8  iSerialNumber; */
-       0x01    /*  __u8  bNumConfigurations; */
-};
-
-/* Configuration descriptor */
-static __u8 root_hub_config_des[] = {
-       0x09,   /*  __u8  bLength; */
-       0x02,   /*  __u8  bDescriptorType; Configuration */
-       0x19,   /*  __u16 wTotalLength; */
-       0x00,
-       0x01,   /*  __u8  bNumInterfaces; */
-       0x01,   /*  __u8  bConfigurationValue; */
-       0x00,   /*  __u8  iConfiguration; */
-       0x40,   /*  __u8  bmAttributes;
-                  Bit 7: Bus-powered, 6: Self-powered,
-                  5 Remote-wakwup, 4..0: resvd */
-       0x00,   /*  __u8  MaxPower; */
-
-       /* interface */
-       0x09,   /*  __u8  if_bLength; */
-       0x04,   /*  __u8  if_bDescriptorType; Interface */
-       0x00,   /*  __u8  if_bInterfaceNumber; */
-       0x00,   /*  __u8  if_bAlternateSetting; */
-       0x01,   /*  __u8  if_bNumEndpoints; */
-       0x09,   /*  __u8  if_bInterfaceClass; HUB_CLASSCODE */
-       0x00,   /*  __u8  if_bInterfaceSubClass; */
-       0x00,   /*  __u8  if_bInterfaceProtocol; */
-       0x00,   /*  __u8  if_iInterface; */
-
-       /* endpoint */
-       0x07,   /*  __u8  ep_bLength; */
-       0x05,   /*  __u8  ep_bDescriptorType; Endpoint */
-       0x81,   /*  __u8  ep_bEndpointAddress; IN Endpoint 1 */
-       0x03,   /*  __u8  ep_bmAttributes; Interrupt */
-       0x02,   /*  __u16 ep_wMaxPacketSize; ((MAX_ROOT_PORTS + 1) / 8 */
-       0x00,
-       0xff    /*  __u8  ep_bInterval; 255 ms */
-};
-
-static unsigned char root_hub_str_index0[] = {
-       0x04,   /*  __u8  bLength; */
-       0x03,   /*  __u8  bDescriptorType; String-descriptor */
-       0x09,   /*  __u8  lang ID */
-       0x04,   /*  __u8  lang ID */
-};
-
-static unsigned char root_hub_str_index1[] = {
-       28,     /*  __u8  bLength; */
-       0x03,   /*  __u8  bDescriptorType; String-descriptor */
-       'O',    /*  __u8  Unicode */
-       0,      /*  __u8  Unicode */
-       'H',    /*  __u8  Unicode */
-       0,      /*  __u8  Unicode */
-       'C',    /*  __u8  Unicode */
-       0,      /*  __u8  Unicode */
-       'I',    /*  __u8  Unicode */
-       0,      /*  __u8  Unicode */
-       ' ',    /*  __u8  Unicode */
-       0,      /*  __u8  Unicode */
-       'R',    /*  __u8  Unicode */
-       0,      /*  __u8  Unicode */
-       'o',    /*  __u8  Unicode */
-       0,      /*  __u8  Unicode */
-       'o',    /*  __u8  Unicode */
-       0,      /*  __u8  Unicode */
-       't',    /*  __u8  Unicode */
-       0,      /*  __u8  Unicode */
-       ' ',    /*  __u8  Unicode */
-       0,      /*  __u8  Unicode */
-       'H',    /*  __u8  Unicode */
-       0,      /*  __u8  Unicode */
-       'u',    /*  __u8  Unicode */
-       0,      /*  __u8  Unicode */
-       'b',    /*  __u8  Unicode */
-       0,      /*  __u8  Unicode */
-};
+#include <usbroothubdes.h>
 
 /* Hub class-specific descriptor is constructed dynamically */
 
@@ -1642,7 +1546,7 @@ static void hc_release_ohci(struct ohci *ohci)
  */
 static char ohci_inited = 0;
 
-int usb_lowlevel_init(int index, void **controller)
+int usb_lowlevel_init(int index, enum usb_init_type init, void **controller)
 {
        struct s3c24x0_clock_power *clk_power = s3c24x0_get_base_clock_power();
        struct s3c24x0_gpio *gpio = s3c24x0_get_base_gpio();