From 3d9ce2709ea1e155431accdc327ef2b2c6a44ceb Mon Sep 17 00:00:00 2001
From: Felipe Balbi <balbi@ti.com>
Date: Thu, 1 Sep 2011 18:33:43 +0300
Subject: [PATCH] --- yaml --- r: 264980 b: refs/heads/master c:
 29d8bc133f7bb3172201dc3f6540562cec195d13 h: refs/heads/master v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/usb/dwc3/dwc3-omap.c | 41 ------------------------------
 2 files changed, 1 insertion(+), 42 deletions(-)

diff --git a/[refs] b/[refs]
index a1ae7d7163a8..d2cf9322585f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df01c61e0675bddc8d0567d65f6174cdeb92c286
+refs/heads/master: 29d8bc133f7bb3172201dc3f6540562cec195d13
diff --git a/trunk/drivers/usb/dwc3/dwc3-omap.c b/trunk/drivers/usb/dwc3/dwc3-omap.c
index a4788ac53c0e..17d1822f7687 100644
--- a/trunk/drivers/usb/dwc3/dwc3-omap.c
+++ b/trunk/drivers/usb/dwc3/dwc3-omap.c
@@ -125,46 +125,6 @@ struct dwc3_omap {
 	u32			dma_status:1;
 };
 
-#ifdef CONFIG_PM
-static int dwc3_omap_suspend(struct device *dev)
-{
-	struct dwc3_omap	*omap = dev_get_drvdata(dev);
-
-	memcpy_fromio(omap->context, omap->base, omap->resource_size);
-
-	return 0;
-}
-
-static int dwc3_omap_resume(struct device *dev)
-{
-	struct dwc3_omap	*omap = dev_get_drvdata(dev);
-
-	memcpy_toio(omap->base, omap->context, omap->resource_size);
-
-	return 0;
-}
-
-static int dwc3_omap_idle(struct device *dev)
-{
-	struct dwc3_omap	*omap = dev_get_drvdata(dev);
-	u32			reg;
-
-	/* stop DMA Engine */
-	reg = dwc3_readl(omap->base, USBOTGSS_SYSCONFIG);
-	reg &= ~(USBOTGSS_SYSCONFIG_DMADISABLE);
-	dwc3_writel(omap->base, USBOTGSS_SYSCONFIG, reg);
-
-	return 0;
-}
-
-static UNIVERSAL_DEV_PM_OPS(dwc3_omap_pm_ops, dwc3_omap_suspend,
-		dwc3_omap_resume, dwc3_omap_idle);
-
-#define DEV_PM_OPS	(&dwc3_omap_pm_ops)
-#else
-#define DEV_PM_OPS	NULL
-#endif
-
 static irqreturn_t dwc3_omap_interrupt(int irq, void *_omap)
 {
 	struct dwc3_omap	*omap = _omap;
@@ -388,7 +348,6 @@ static struct platform_driver dwc3_omap_driver = {
 	.remove		= __devexit_p(dwc3_omap_remove),
 	.driver		= {
 		.name	= "omap-dwc3",
-		.pm	= DEV_PM_OPS,
 		.of_match_table	= of_dwc3_matach,
 	},
 };