From 2a060fae698c23caed2867c452d5c1e48f7551e4 Mon Sep 17 00:00:00 2001
From: Shawn Guo <shawn.guo@linaro.org>
Date: Sun, 29 Apr 2012 00:02:41 +0800
Subject: [PATCH] --- yaml --- r: 308263 b: refs/heads/master c:
 50260924afd4b745bfb6e5f1caee381a1875fc31 h: refs/heads/master i:   308261:
 77f799c3274800e05db16607e3eac32bf798a39b   308259:
 d79b874114e6c38612cea5f2c910b3984107220c   308255:
 da1edb657c11ab79bebb39c1848ff3b39005aeb9 v: v3

---
 [refs]                                        |  2 +-
 trunk/arch/arm/mach-mxs/include/mach/common.h |  4 +---
 trunk/arch/arm/mach-mxs/timer.c               | 14 +++++++-------
 trunk/drivers/clk/mxs/clk-imx23.c             |  2 +-
 trunk/drivers/clk/mxs/clk-imx28.c             |  2 +-
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 2e36bb9c6f6c..3d440c864ae2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5da301a2056529cc5366f21d4325b96052d9cad1
+refs/heads/master: 50260924afd4b745bfb6e5f1caee381a1875fc31
diff --git a/trunk/arch/arm/mach-mxs/include/mach/common.h b/trunk/arch/arm/mach-mxs/include/mach/common.h
index e1237ab25862..9bdc95388871 100644
--- a/trunk/arch/arm/mach-mxs/include/mach/common.h
+++ b/trunk/arch/arm/mach-mxs/include/mach/common.h
@@ -11,11 +11,9 @@
 #ifndef __MACH_MXS_COMMON_H__
 #define __MACH_MXS_COMMON_H__
 
-struct clk;
-
 extern const u32 *mxs_get_ocotp(void);
 extern int mxs_reset_block(void __iomem *);
-extern void mxs_timer_init(struct clk *, int);
+extern void mxs_timer_init(int);
 extern void mxs_restart(char, const char *);
 extern int mxs_saif_clkmux_select(unsigned int clkmux);
 
diff --git a/trunk/arch/arm/mach-mxs/timer.c b/trunk/arch/arm/mach-mxs/timer.c
index 575e8fd6bc79..02d36de9c4e8 100644
--- a/trunk/arch/arm/mach-mxs/timer.c
+++ b/trunk/arch/arm/mach-mxs/timer.c
@@ -244,14 +244,14 @@ static int __init mxs_clocksource_init(struct clk *timer_clk)
 	return 0;
 }
 
-void __init mxs_timer_init(struct clk *timer_clk, int irq)
+void __init mxs_timer_init(int irq)
 {
-	if (!timer_clk) {
-		timer_clk = clk_get_sys("timrot", NULL);
-		if (IS_ERR(timer_clk)) {
-			pr_err("%s: failed to get clk\n", __func__);
-			return;
-		}
+	struct clk *timer_clk;
+
+	timer_clk = clk_get_sys("timrot", NULL);
+	if (IS_ERR(timer_clk)) {
+		pr_err("%s: failed to get clk\n", __func__);
+		return;
 	}
 
 	clk_prepare_enable(timer_clk);
diff --git a/trunk/drivers/clk/mxs/clk-imx23.c b/trunk/drivers/clk/mxs/clk-imx23.c
index 2ec76ff46971..dcae11285716 100644
--- a/trunk/drivers/clk/mxs/clk-imx23.c
+++ b/trunk/drivers/clk/mxs/clk-imx23.c
@@ -198,7 +198,7 @@ int __init mx23_clocks_init(void)
 	for (i = 0; i < ARRAY_SIZE(clks_init_on); i++)
 		clk_prepare_enable(clks[clks_init_on[i]]);
 
-	mxs_timer_init(NULL, MX23_INT_TIMER0);
+	mxs_timer_init(MX23_INT_TIMER0);
 
 	return 0;
 }
diff --git a/trunk/drivers/clk/mxs/clk-imx28.c b/trunk/drivers/clk/mxs/clk-imx28.c
index 4bfd1f4a8736..b2a3257d4f66 100644
--- a/trunk/drivers/clk/mxs/clk-imx28.c
+++ b/trunk/drivers/clk/mxs/clk-imx28.c
@@ -331,7 +331,7 @@ int __init mx28_clocks_init(void)
 	for (i = 0; i < ARRAY_SIZE(clks_init_on); i++)
 		clk_prepare_enable(clks[clks_init_on[i]]);
 
-	mxs_timer_init(NULL, MX28_INT_TIMER0);
+	mxs_timer_init(MX28_INT_TIMER0);
 
 	return 0;
 }