USB: usb dev_name() instead of dev->bus_id

[linux-2.6] / drivers / usb / host / ehci-ps3.c

diff --git a/drivers/usb/host/ehci-ps3.c b/drivers/usb/host/ehci-ps3.c
index 829fe649a981fdc03ad6f5cb64df4f9f0b8e4024..0eba894bcb017aa0706f5e60224149e76338d99a 100644 (file)
--- a/drivers/usb/host/ehci-ps3.c
+++ b/drivers/usb/host/ehci-ps3.c
@@ -47,7 +47,7 @@ static int ps3_ehci_hc_reset(struct usb_hcd *hcd)
        if (result)
                return result;
 
-       ehci_port_power(ehci, 0);
+       ehci_reset(ehci);
 
        return result;
 }
@@ -72,6 +72,8 @@ static const struct hc_driver ps3_ehci_hc_driver = {
        .bus_suspend            = ehci_bus_suspend,
        .bus_resume             = ehci_bus_resume,
 #endif
+       .relinquish_port        = ehci_relinquish_port,
+       .port_handed_over       = ehci_port_handed_over,
 };
 
 static int ps3_ehci_probe(struct ps3_system_bus_device *dev)
@@ -124,10 +126,9 @@ static int ps3_ehci_probe(struct ps3_system_bus_device *dev)
                goto fail_irq;
        }
 
-       dev->core.power.power_state = PMSG_ON;
        dev->core.dma_mask = &dummy_mask; /* FIXME: for improper usb code */
 
-       hcd = usb_create_hcd(&ps3_ehci_hc_driver, &dev->core, dev->core.bus_id);
+       hcd = usb_create_hcd(&ps3_ehci_hc_driver, &dev->core, dev_name(&dev->core));
 
        if (!hcd) {
                dev_dbg(&dev->core, "%s:%d: usb_create_hcd failed\n", __func__,