Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / usb / host / ehci-ps3.c

diff --git a/drivers/usb/host/ehci-ps3.c b/drivers/usb/host/ehci-ps3.c
index 4b4df23..eecd2a0 100644 (file)
--- a/drivers/usb/host/ehci-ps3.c
+++ b/drivers/usb/host/ehci-ps3.c
@@ -163,7 +163,7 @@ static int ps3_ehci_probe(struct ps3_system_bus_device *dev)
        dev_dbg(&dev->core, "%s:%d: virq            %lu\n", __func__, __LINE__,
                (unsigned long)virq);
 
-       ps3_system_bus_set_driver_data(dev, hcd);
+       ps3_system_bus_set_drvdata(dev, hcd);
 
        result = usb_add_hcd(hcd, virq, IRQF_DISABLED);
 
@@ -196,8 +196,7 @@ fail_start:
 static int ps3_ehci_remove(struct ps3_system_bus_device *dev)
 {
        unsigned int tmp;
-       struct usb_hcd *hcd =
-               (struct usb_hcd *)ps3_system_bus_get_driver_data(dev);
+       struct usb_hcd *hcd = ps3_system_bus_get_drvdata(dev);
 
        BUG_ON(!hcd);
 
@@ -209,7 +208,7 @@ static int ps3_ehci_remove(struct ps3_system_bus_device *dev)
        ehci_shutdown(hcd);
        usb_remove_hcd(hcd);
 
-       ps3_system_bus_set_driver_data(dev, NULL);
+       ps3_system_bus_set_drvdata(dev, NULL);
 
        BUG_ON(!hcd->regs);
        iounmap(hcd->regs);