1 files changed, 8 insertions, 79 deletions

diff --git a/drivers/usb/host/ehci-au1xxx.c b/drivers/usb/host/ehci-au1xxx.c
index bf7441afed16..cba10d625a5d 100644
--- a/drivers/usb/host/ehci-au1xxx.c
+++ b/drivers/usb/host/ehci-au1xxx.c
@@ -20,10 +20,12 @@ extern int usb_disabled(void);
 static int au1xxx_ehci_setup(struct usb_hcd *hcd)
 {
         struct ehci_hcd *ehci = hcd_to_ehci(hcd);
-        int ret = ehci_init(hcd);
+        int ret;
+
+        ehci->caps = hcd->regs;
+        ret = ehci_setup(hcd);
 
         ehci->need_io_watchdog = 0;
-        ehci_reset(ehci);
         return ret;
 }
 
@@ -78,7 +80,6 @@ static const struct hc_driver ehci_au1xxx_hc_driver = {
 static int ehci_hcd_au1xxx_drv_probe(struct platform_device *pdev)
 {
         struct usb_hcd *hcd;
-        struct ehci_hcd *ehci;
         struct resource *res;
         int ret;
 
@@ -116,13 +117,6 @@ static int ehci_hcd_au1xxx_drv_probe(struct platform_device *pdev)
                 goto err3;
         }
 
-        ehci = hcd_to_ehci(hcd);
-        ehci->caps = hcd->regs;
-        ehci->regs = hcd->regs +
-                HC_LENGTH(ehci, readl(&ehci->caps->hc_capbase));
-        /* cache this readonly data; minimize chip reads */
-        ehci->hcs_params = readl(&ehci->caps->hcs_params);
-
         ret = usb_add_hcd(hcd, pdev->resource[1].start,
                           IRQF_SHARED);
         if (ret == 0) {
@@ -158,28 +152,10 @@ static int ehci_hcd_au1xxx_drv_remove(struct platform_device *pdev)
 static int ehci_hcd_au1xxx_drv_suspend(struct device *dev)
 {
         struct usb_hcd *hcd = dev_get_drvdata(dev);
-        struct ehci_hcd *ehci = hcd_to_ehci(hcd);
-        unsigned long flags;
-        int rc = 0;
-
-        if (time_before(jiffies, ehci->next_statechange))
-                msleep(10);
-
-        /* Root hub was already suspended. Disable irq emission and
-         * mark HW unaccessible.  The PM and USB cores make sure that
-         * the root hub is either suspended or stopped.
-         */
-        ehci_prepare_ports_for_controller_suspend(ehci, device_may_wakeup(dev));
-        spin_lock_irqsave(&ehci->lock, flags);
-        ehci_writel(ehci, 0, &ehci->regs->intr_enable);
-        (void)ehci_readl(ehci, &ehci->regs->intr_enable);
-
-        clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
-        spin_unlock_irqrestore(&ehci->lock, flags);
-
-        // could save FLADJ in case of Vaux power loss
-        // ... we'd only use it to handle clock skew
+        bool do_wakeup = device_may_wakeup(dev);
+        int rc;
 
+        rc = ehci_suspend(hcd, do_wakeup);
         alchemy_usb_control(ALCHEMY_USB_EHCI0, 0);
 
         return rc;
@@ -188,56 +164,9 @@ static int ehci_hcd_au1xxx_drv_suspend(struct device *dev)
 static int ehci_hcd_au1xxx_drv_resume(struct device *dev)
 {
         struct usb_hcd *hcd = dev_get_drvdata(dev);
-        struct ehci_hcd *ehci = hcd_to_ehci(hcd);
 
         alchemy_usb_control(ALCHEMY_USB_EHCI0, 1);
-
-        // maybe restore FLADJ
-
-        if (time_before(jiffies, ehci->next_statechange))
-                msleep(100);
-
-        /* Mark hardware accessible again as we are out of D3 state by now */
-        set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
-
-        /* If CF is still set, we maintained PCI Vaux power.
-         * Just undo the effect of ehci_pci_suspend().
-         */
-        if (ehci_readl(ehci, &ehci->regs->configured_flag) == FLAG_CF) {
-                int     mask = INTR_MASK;
-
-                ehci_prepare_ports_for_controller_resume(ehci);
-                if (!hcd->self.root_hub->do_remote_wakeup)
-                        mask &= ~STS_PCD;
-                ehci_writel(ehci, mask, &ehci->regs->intr_enable);
-                ehci_readl(ehci, &ehci->regs->intr_enable);
-                return 0;
-        }
-
-        ehci_dbg(ehci, "lost power, restarting\n");
-        usb_root_hub_lost_power(hcd->self.root_hub);
-
-        /* Else reset, to cope with power loss or flush-to-storage
-         * style "resume" having let BIOS kick in during reboot.
-         */
-        (void) ehci_halt(ehci);
-        (void) ehci_reset(ehci);
-
-        /* emptying the schedule aborts any urbs */
-        spin_lock_irq(&ehci->lock);
-        if (ehci->reclaim)
-                end_unlink_async(ehci);
-        ehci_work(ehci);
-        spin_unlock_irq(&ehci->lock);
-
-        ehci_writel(ehci, ehci->command, &ehci->regs->command);
-        ehci_writel(ehci, FLAG_CF, &ehci->regs->configured_flag);
-        ehci_readl(ehci, &ehci->regs->command); /* unblock posted writes */
-
-        /* here we "know" root ports should always stay powered */
-        ehci_port_power(ehci, 1);
-
-        ehci->rh_state = EHCI_RH_SUSPENDED;
+        ehci_resume(hcd, false);
 
         return 0;
 }