From 5f1aa4e097de8ed8d00762f6598b947019422f82 Mon Sep 17 00:00:00 2001
From: Felipe Balbi <felipe.balbi@nokia.com>
Date: Wed, 17 Feb 2010 14:09:30 -0800
Subject: [PATCH] --- yaml --- r: 184757 b: refs/heads/master c:
 bfc110ee653724577e635e0feacf29aad4ed6c7f h: refs/heads/master i:   184755:
 806a174839ee381eb6aceaf14bdb18d3d4e15eb0 v: v3

---
 [refs]                               |  2 +-
 trunk/arch/arm/mach-omap2/usb-musb.c | 22 ----------------------
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/[refs] b/[refs]
index ab9de409bfda..d276568a4e3a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68499cc5716bbeca16ca8c83ec6e9f04b8dbfacb
+refs/heads/master: bfc110ee653724577e635e0feacf29aad4ed6c7f
diff --git a/trunk/arch/arm/mach-omap2/usb-musb.c b/trunk/arch/arm/mach-omap2/usb-musb.c
index 7e2ee01dcd5a..c7d98a924df3 100644
--- a/trunk/arch/arm/mach-omap2/usb-musb.c
+++ b/trunk/arch/arm/mach-omap2/usb-musb.c
@@ -47,27 +47,6 @@ static struct resource musb_resources[] = {
 	},
 };
 
-static int clk_on;
-
-static int musb_set_clock(struct clk *clk, int state)
-{
-	if (state) {
-		if (clk_on > 0)
-			return -ENODEV;
-
-		clk_enable(clk);
-		clk_on = 1;
-	} else {
-		if (clk_on == 0)
-			return -ENODEV;
-
-		clk_disable(clk);
-		clk_on = 0;
-	}
-
-	return 0;
-}
-
 static struct musb_hdrc_config musb_config = {
 	.multipoint	= 1,
 	.dyn_fifo	= 1,
@@ -88,7 +67,6 @@ static struct musb_hdrc_platform_data musb_plat = {
 	.mode		= MUSB_PERIPHERAL,
 #endif
 	/* .clock is set dynamically */
-	.set_clock	= musb_set_clock,
 	.config		= &musb_config,
 
 	/* REVISIT charge pump on TWL4030 can supply up to