EHCI: centralize controller suspend/resume

This patch (as1563) removes a lot of duplicated code by moving the
EHCI controller suspend/resume routines into the core driver, where
the various platform drivers can invoke them as needed.

Not only does this simplify these platform drivers, this also makes it
easier for other platform drivers to add suspend/resume support in the
future.

Note: The patch does not touch the ehci-fsl.c file, because its
approach to suspend and resume is so different from all the others.
It will have to be handled specially by its maintainer.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 3 insertions, 16 deletions

diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c
index 6b4ffb598db1..17dd9e94001e 100644
--- a/drivers/usb/host/ehci-msm.c
+++ b/drivers/usb/host/ehci-msm.c
@@ -198,24 +198,11 @@ static int __devexit ehci_msm_remove(struct platform_device *pdev)
 static int ehci_msm_pm_suspend(struct device *dev)
 {
         struct usb_hcd *hcd = dev_get_drvdata(dev);
-        bool wakeup = device_may_wakeup(dev);
+        bool do_wakeup = device_may_wakeup(dev);
 
         dev_dbg(dev, "ehci-msm PM suspend\n");
 
-        /*
-         * EHCI helper function has also the same check before manipulating
-         * port wakeup flags.  We do check here the same condition before
-         * calling the same helper function to avoid bringing hardware
-         * from Low power mode when there is no need for adjusting port
-         * wakeup flags.
-         */
-        if (hcd->self.root_hub->do_remote_wakeup && !wakeup) {
-                pm_runtime_resume(dev);
-                ehci_prepare_ports_for_controller_suspend(hcd_to_ehci(hcd),
-                                wakeup);
-        }
-
-        return 0;
+        return ehci_suspend(hcd, do_wakeup);
 }
 
 static int ehci_msm_pm_resume(struct device *dev)
@@ -223,7 +210,7 @@ static int ehci_msm_pm_resume(struct device *dev)
         struct usb_hcd *hcd = dev_get_drvdata(dev);
 
         dev_dbg(dev, "ehci-msm PM resume\n");
-        ehci_prepare_ports_for_controller_resume(hcd_to_ehci(hcd));
+        ehci_resume(hcd, false);
 
         return 0;
 }