usb: dwc3: get rid of ->prepare()/->complete()

Using ->prepare()/->complete() to mask/unmask
IRQs is wrong at least for dwc3. We need to
make sure that by the end of ->resume(), IRQs
are working and ready to fire because a child
device may need working IRQs for its own ->resume()
method.

Signed-off-by: Felipe Balbi <balbi@ti.com>

1 files changed, 2 insertions, 48 deletions

diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 4d4e854f99aa..fa396fc57a85 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -825,50 +825,6 @@ static int dwc3_remove(struct platform_device *pdev)
 }
 
 #ifdef CONFIG_PM_SLEEP
-static int dwc3_prepare(struct device *dev)
-{
-        struct dwc3     *dwc = dev_get_drvdata(dev);
-        unsigned long   flags;
-
-        spin_lock_irqsave(&dwc->lock, flags);
-
-        switch (dwc->dr_mode) {
-        case USB_DR_MODE_PERIPHERAL:
-        case USB_DR_MODE_OTG:
-                dwc3_gadget_prepare(dwc);
-                /* FALLTHROUGH */
-        case USB_DR_MODE_HOST:
-        default:
-                dwc3_event_buffers_cleanup(dwc);
-                break;
-        }
-
-        spin_unlock_irqrestore(&dwc->lock, flags);
-
-        return 0;
-}
-
-static void dwc3_complete(struct device *dev)
-{
-        struct dwc3     *dwc = dev_get_drvdata(dev);
-        unsigned long   flags;
-
-        spin_lock_irqsave(&dwc->lock, flags);
-
-        dwc3_event_buffers_setup(dwc);
-        switch (dwc->dr_mode) {
-        case USB_DR_MODE_PERIPHERAL:
-        case USB_DR_MODE_OTG:
-                dwc3_gadget_complete(dwc);
-                /* FALLTHROUGH */
-        case USB_DR_MODE_HOST:
-        default:
-                break;
-        }
-
-        spin_unlock_irqrestore(&dwc->lock, flags);
-}
-
 static int dwc3_suspend(struct device *dev)
 {
         struct dwc3     *dwc = dev_get_drvdata(dev);
@@ -883,7 +839,7 @@ static int dwc3_suspend(struct device *dev)
                 /* FALLTHROUGH */
         case USB_DR_MODE_HOST:
         default:
-                /* do nothing */
+                dwc3_event_buffers_cleanup(dwc);
                 break;
         }
 
@@ -916,6 +872,7 @@ static int dwc3_resume(struct device *dev)
 
         spin_lock_irqsave(&dwc->lock, flags);
 
+        dwc3_event_buffers_setup(dwc);
         dwc3_writel(dwc->regs, DWC3_GCTL, dwc->gctl);
 
         switch (dwc->dr_mode) {
@@ -944,9 +901,6 @@ err_usb2phy_init:
 }
 
 static const struct dev_pm_ops dwc3_dev_pm_ops = {
-        .prepare        = dwc3_prepare,
-        .complete       = dwc3_complete,
-
         SET_SYSTEM_SLEEP_PM_OPS(dwc3_suspend, dwc3_resume)
 };