From aa75d8dc578cd326fb2298d723c98f1941b668b3 Mon Sep 17 00:00:00 2001
From: Chao Xie <chao.xie@marvell.com>
Date: Mon, 25 Mar 2013 03:06:52 -0400
Subject: [PATCH] --- yaml --- r: 364779 b: refs/heads/master c:
 1919811fe635de4689b4f31a20da3d50196cf43f h: refs/heads/master i:   364777:
 5e11e8f49b3a514dc852c1a6a43787e9043705f7   364775:
 1e3f948d5bf7570ecf792b96c5c48e5a26608fb0 v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/usb/gadget/mv_udc.h      |  3 +--
 trunk/drivers/usb/gadget/mv_udc_core.c | 27 +++++++-------------------
 3 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/[refs] b/[refs]
index 4c0aea6b0be4..dff95aaced64 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b65ae0f1a7b98c370967cf161ee87011e3ecdd77
+refs/heads/master: 1919811fe635de4689b4f31a20da3d50196cf43f
diff --git a/trunk/drivers/usb/gadget/mv_udc.h b/trunk/drivers/usb/gadget/mv_udc.h
index 9073436d8b24..be77f207dbaf 100644
--- a/trunk/drivers/usb/gadget/mv_udc.h
+++ b/trunk/drivers/usb/gadget/mv_udc.h
@@ -222,8 +222,7 @@ struct mv_udc {
 	struct mv_usb_platform_data     *pdata;
 
 	/* some SOC has mutiple clock sources for USB*/
-	unsigned int    clknum;
-	struct clk      *clk[0];
+	struct clk      *clk;
 };
 
 /* endpoint data structure */
diff --git a/trunk/drivers/usb/gadget/mv_udc_core.c b/trunk/drivers/usb/gadget/mv_udc_core.c
index 88be74e6297d..c2a57023e467 100644
--- a/trunk/drivers/usb/gadget/mv_udc_core.c
+++ b/trunk/drivers/usb/gadget/mv_udc_core.c
@@ -974,18 +974,12 @@ static struct usb_ep_ops mv_ep_ops = {
 
 static void udc_clock_enable(struct mv_udc *udc)
 {
-	unsigned int i;
-
-	for (i = 0; i < udc->clknum; i++)
-		clk_prepare_enable(udc->clk[i]);
+	clk_prepare_enable(udc->clk);
 }
 
 static void udc_clock_disable(struct mv_udc *udc)
 {
-	unsigned int i;
-
-	for (i = 0; i < udc->clknum; i++)
-		clk_disable_unprepare(udc->clk[i]);
+	clk_disable_unprepare(udc->clk);
 }
 
 static void udc_stop(struct mv_udc *udc)
@@ -2109,7 +2103,6 @@ static int mv_udc_probe(struct platform_device *pdev)
 	struct mv_usb_platform_data *pdata = pdev->dev.platform_data;
 	struct mv_udc *udc;
 	int retval = 0;
-	int clk_i = 0;
 	struct resource *r;
 	size_t size;
 
@@ -2118,8 +2111,7 @@ static int mv_udc_probe(struct platform_device *pdev)
 		return -ENODEV;
 	}
 
-	size = sizeof(*udc) + sizeof(struct clk *) * pdata->clknum;
-	udc = devm_kzalloc(&pdev->dev, size, GFP_KERNEL);
+	udc = devm_kzalloc(&pdev->dev, sizeof(*udc), GFP_KERNEL);
 	if (udc == NULL) {
 		dev_err(&pdev->dev, "failed to allocate memory for udc\n");
 		return -ENOMEM;
@@ -2145,15 +2137,10 @@ static int mv_udc_probe(struct platform_device *pdev)
 		}
 	}
 
-	udc->clknum = pdata->clknum;
-	for (clk_i = 0; clk_i < udc->clknum; clk_i++) {
-		udc->clk[clk_i] = devm_clk_get(&pdev->dev,
-					pdata->clkname[clk_i]);
-		if (IS_ERR(udc->clk[clk_i])) {
-			retval = PTR_ERR(udc->clk[clk_i]);
-			return retval;
-		}
-	}
+	/* udc only have one sysclk. */
+	udc->clk = devm_clk_get(&pdev->dev, NULL);
+	if (IS_ERR(udc->clk))
+		return PTR_ERR(udc->clk);
 
 	r = platform_get_resource_byname(udc->dev, IORESOURCE_MEM, "capregs");
 	if (r == NULL) {