usb: xhci: Fix suspend/resume when used with OTG core

[cascardo/linux.git] / drivers / usb / host / xhci-plat.c

diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
index 783e819..890ad9d 100644 (file)
--- a/drivers/usb/host/xhci-plat.c
+++ b/drivers/usb/host/xhci-plat.c
@@ -26,6 +26,15 @@
 
 static struct hc_driver __read_mostly xhci_plat_hc_driver;
 
+static int xhci_plat_setup(struct usb_hcd *hcd);
+static int xhci_plat_start(struct usb_hcd *hcd);
+
+static const struct xhci_driver_overrides xhci_plat_overrides __initconst = {
+       .extra_priv_size = sizeof(struct xhci_hcd),
+       .reset = xhci_plat_setup,
+       .start = xhci_plat_start,
+};
+
 static void xhci_plat_quirks(struct device *dev, struct xhci_hcd *xhci)
 {
        /*
@@ -127,31 +136,21 @@ static int xhci_plat_probe(struct platform_device *pdev)
                        goto disable_clk;
        }
 
-       ret = usb_add_hcd(hcd, irq, IRQF_SHARED);
-       if (ret)
-               goto disable_clk;
-
        device_wakeup_enable(hcd->self.controller);
 
-       /* USB 2.0 roothub is stored in the platform_device now. */
-       hcd = platform_get_drvdata(pdev);
        xhci = hcd_to_xhci(hcd);
        xhci->clk = clk;
+       xhci->main_hcd = hcd;
        xhci->shared_hcd = usb_create_shared_hcd(driver, &pdev->dev,
                        dev_name(&pdev->dev), hcd);
        if (!xhci->shared_hcd) {
                ret = -ENOMEM;
-               goto dealloc_usb2_hcd;
+               goto disable_clk;
        }
 
        if ((node && of_property_read_bool(node, "usb3-lpm-capable")) ||
                        (pdata && pdata->usb3_lpm_capable))
                xhci->quirks |= XHCI_LPM_SUPPORT;
-       /*
-        * Set the xHCI pointer before xhci_plat_setup() (aka hcd_driver.reset)
-        * is called by usb_add_hcd().
-        */
-       *((struct xhci_hcd **) xhci->shared_hcd->hcd_priv) = xhci;
 
        if (HCC_MAX_PSA(xhci->hcc_params) >= 4)
                xhci->shared_hcd->can_do_streams = 1;
@@ -168,21 +167,26 @@ static int xhci_plat_probe(struct platform_device *pdev)
                        goto put_usb3_hcd;
        }
 
-       ret = usb_add_hcd(xhci->shared_hcd, irq, IRQF_SHARED);
+       ret = usb_add_hcd(hcd, irq, IRQF_SHARED);
        if (ret)
                goto disable_usb_phy;
 
+       ret = usb_add_hcd(xhci->shared_hcd, irq, IRQF_SHARED);
+       if (ret)
+               goto dealloc_usb2_hcd;
+
        return 0;
 
+
+dealloc_usb2_hcd:
+       usb_remove_hcd(hcd);
+
 disable_usb_phy:
        usb_phy_shutdown(hcd->usb_phy);
 
 put_usb3_hcd:
        usb_put_hcd(xhci->shared_hcd);
 
-dealloc_usb2_hcd:
-       usb_remove_hcd(hcd);
-
 disable_clk:
        if (!IS_ERR(clk))
                clk_disable_unprepare(clk);
@@ -201,13 +205,13 @@ static int xhci_plat_remove(struct platform_device *dev)
 
        usb_remove_hcd(xhci->shared_hcd);
        usb_phy_shutdown(hcd->usb_phy);
-       usb_put_hcd(xhci->shared_hcd);
 
        usb_remove_hcd(hcd);
+       usb_put_hcd(xhci->shared_hcd);
+
        if (!IS_ERR(clk))
                clk_disable_unprepare(clk);
        usb_put_hcd(hcd);
-       kfree(xhci);
 
        return 0;
 }
@@ -271,8 +275,7 @@ MODULE_ALIAS("platform:xhci-hcd");
 
 static int __init xhci_plat_init(void)
 {
-       xhci_init_driver(&xhci_plat_hc_driver, xhci_plat_setup);
-       xhci_plat_hc_driver.start = xhci_plat_start;
+       xhci_init_driver(&xhci_plat_hc_driver, &xhci_plat_overrides);
        return platform_driver_register(&usb_xhci_driver);
 }
 module_init(xhci_plat_init);