From 07466db59880469738fb51bc08f088e1acf6b86f Mon Sep 17 00:00:00 2001
From: Hema HK <hemahk@ti.com>
Date: Mon, 28 Feb 2011 14:19:33 +0530
Subject: [PATCH] --- yaml --- r: 235371 b: refs/heads/master c:
 da68ccec210c45eb99e461ad31b499b4e7043c41 h: refs/heads/master i:   235369:
 2a6107e4f078323605305bda30949689630a09ef   235367:
 36c74e9147cb6f4a72635308a69160adb1e9d9c8 v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/usb/musb/musb_core.h |  4 ----
 trunk/drivers/usb/musb/omap2430.c  | 11 -----------
 3 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index fb3df19869c9..765d95a80b79 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4cbbf084436caddeb815534df4ebaa018c970196
+refs/heads/master: da68ccec210c45eb99e461ad31b499b4e7043c41
diff --git a/trunk/drivers/usb/musb/musb_core.h b/trunk/drivers/usb/musb/musb_core.h
index 5216729bd4b2..5cb50f8f2907 100644
--- a/trunk/drivers/usb/musb/musb_core.h
+++ b/trunk/drivers/usb/musb/musb_core.h
@@ -358,10 +358,6 @@ struct musb_csr_regs {
 
 struct musb_context_registers {
 
-#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) || \
-    defined(CONFIG_ARCH_OMAP4)
-	u32 otg_forcestandby;
-#endif
 	u8 power;
 	u16 intrtxe, intrrxe;
 	u8 intrusbe;
diff --git a/trunk/drivers/usb/musb/omap2430.c b/trunk/drivers/usb/musb/omap2430.c
index 64cf2431c05e..b6dcc7eaa21f 100644
--- a/trunk/drivers/usb/musb/omap2430.c
+++ b/trunk/drivers/usb/musb/omap2430.c
@@ -488,15 +488,6 @@ static int __exit omap2430_remove(struct platform_device *pdev)
 }
 
 #ifdef CONFIG_PM
-static void omap2430_save_context(struct musb *musb)
-{
-	musb->context.otg_forcestandby = musb_readl(musb->mregs, OTG_FORCESTDBY);
-}
-
-static void omap2430_restore_context(struct musb *musb)
-{
-	musb_writel(musb->mregs, OTG_FORCESTDBY, musb->context.otg_forcestandby);
-}
 
 static int omap2430_suspend(struct device *dev)
 {
@@ -505,7 +496,6 @@ static int omap2430_suspend(struct device *dev)
 
 	omap2430_low_level_exit(musb);
 	otg_set_suspend(musb->xceiv, 1);
-	omap2430_save_context(musb);
 
 	if (!pm_runtime_suspended(dev) && dev->bus && dev->bus->pm &&
 			dev->bus->pm->runtime_suspend)
@@ -524,7 +514,6 @@ static int omap2430_resume(struct device *dev)
 		dev->bus->pm->runtime_resume(dev);
 
 	omap2430_low_level_init(musb);
-	omap2430_restore_context(musb);
 	otg_set_suspend(musb->xceiv, 0);
 
 	return 0;