From 5e2f45b39c12034ae4d7387fc6b7278751067a00 Mon Sep 17 00:00:00 2001
From: Felipe Balbi <balbi@ti.com>
Date: Thu, 2 Dec 2010 13:17:53 +0200
Subject: [PATCH] --- yaml --- r: 227011 b: refs/heads/master c:
 784173723e2fd23332af948a90612950964cd140 h: refs/heads/master i:   227009:
 e2615c0ccadcb4723c39c47684ef8ed074453af4   227007:
 45198f3528ec14f14811b1152d16539319e8a404 v: v3

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

diff --git a/[refs] b/[refs]
index 613234f3f3a9..3fffc78ca088 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fcd22e3b1f12e026dfefca20c97ff550a0e11b2b
+refs/heads/master: 784173723e2fd23332af948a90612950964cd140
diff --git a/trunk/drivers/usb/musb/musb_core.c b/trunk/drivers/usb/musb/musb_core.c
index 437a4c8c0128..e24bb41df1dc 100644
--- a/trunk/drivers/usb/musb/musb_core.c
+++ b/trunk/drivers/usb/musb/musb_core.c
@@ -2306,8 +2306,6 @@ static void musb_save_context(struct musb *musb)
 				musb_read_rxhubport(musb_base, i);
 		}
 	}
-
-	musb_platform_suspend(musb);
 }
 
 static void musb_restore_context(struct musb *musb)
@@ -2317,8 +2315,6 @@ static void musb_restore_context(struct musb *musb)
 	void __iomem *ep_target_regs;
 	void __iomem *epio;
 
-	musb_platform_resume(musb);
-
 	if (is_host_enabled(musb)) {
 		musb_writew(musb_base, MUSB_FRAME, musb->context.frame);
 		musb_writeb(musb_base, MUSB_TESTMODE, musb->context.testmode);
diff --git a/trunk/drivers/usb/musb/musb_core.h b/trunk/drivers/usb/musb/musb_core.h
index f8efd543c5f2..9a3c71fce2b4 100644
--- a/trunk/drivers/usb/musb/musb_core.h
+++ b/trunk/drivers/usb/musb/musb_core.h
@@ -257,8 +257,6 @@ enum musb_g_ep0_state {
  * struct musb_platform_ops - Operations passed to musb_core by HW glue layer
  * @init:	turns on clocks, sets up platform-specific registers, etc
  * @exit:	undoes @init
- * @suspend:	platform-specific suspend, e.g. context save
- * @resume:	platform-specific resume, e.g. context restore
  * @set_mode:	forcefully changes operating mode
  * @try_ilde:	tries to idle the IP
  * @vbus_status: returns vbus status if possible
@@ -268,9 +266,6 @@ struct musb_platform_ops {
 	int	(*init)(struct musb *musb);
 	int	(*exit)(struct musb *musb);
 
-	int	(*suspend)(struct musb *musb);
-	int	(*resume)(struct musb *musb);
-
 	void	(*enable)(struct musb *musb);
 	void	(*disable)(struct musb *musb);
 
@@ -660,20 +655,4 @@ static inline int musb_platform_exit(struct musb *musb)
 	return musb->ops->exit(musb);
 }
 
-static inline int musb_platform_suspend(struct musb *musb)
-{
-	if (!musb->ops->suspend)
-		return 0;
-
-	return musb->ops->suspend(musb);
-}
-
-static inline int musb_platform_resume(struct musb *musb)
-{
-	if (!musb->ops->resume)
-		return 0;
-
-	return musb->ops->resume(musb);
-}
-
 #endif	/* __MUSB_CORE_H__ */