[PATCH] USB: Rename hcd->hub_suspend to hcd->bus_suspend

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

diff --git a/drivers/usb/host/ohci-s3c2410.c b/drivers/usb/host/ohci-s3c2410.c
index e940166..3225d45 100644 (file)
--- a/drivers/usb/host/ohci-s3c2410.c
+++ b/drivers/usb/host/ohci-s3c2410.c
@@ -20,7 +20,6 @@
 */
 
 #include <asm/hardware.h>
-#include <asm/mach-types.h>
 #include <asm/hardware/clock.h>
 #include <asm/arch/usb-control.h>
 
@@ -129,7 +128,7 @@ static void s3c2410_usb_set_power(struct s3c2410_hcd_info *info,
 
        if (info->power_control != NULL) {
                info->port[port-1].power = to;
-               (info->power_control)(port, to);
+               (info->power_control)(port-1, to);
        }
 }
 
@@ -339,8 +338,8 @@ int usb_hcd_s3c2410_probe (const struct hc_driver *driver,
        struct usb_hcd *hcd = NULL;
        int retval;
 
-       s3c2410_usb_set_power(dev->dev.platform_data, 0, 1);
        s3c2410_usb_set_power(dev->dev.platform_data, 1, 1);
+       s3c2410_usb_set_power(dev->dev.platform_data, 2, 1);
 
        hcd = usb_create_hcd(driver, &dev->dev, "s3c24xx");
        if (hcd == NULL)
@@ -449,11 +448,11 @@ static const struct hc_driver ohci_s3c2410_hc_driver = {
         */
        .hub_status_data =      ohci_s3c2410_hub_status_data,
        .hub_control =          ohci_s3c2410_hub_control,
-
-#if defined(CONFIG_USB_SUSPEND) && 0
-       .hub_suspend =          ohci_hub_suspend,
-       .hub_resume =           ohci_hub_resume,
+#ifdef CONFIG_PM
+       .bus_suspend =          ohci_bus_suspend,
+       .bus_resume =           ohci_bus_resume,
 #endif
+       .start_port_reset =     ohci_start_port_reset,
 };
 
 /* device driver */