Skip to contentSkip to conversation

ARM: SAMSUNG: Make clk_default_setrate and clk_ops_def_setrate visible

PATCH New Kukjin Kim 2 participants 2 messages Jan 14, 2010

Subsystems (2)
lore
Share & tools
lore

Kukjin Kim

author
#0 lore raw

PATCH v2 2/3 ARM: SAMSUNG: Make clk_default_setrate and clk_ops_def_setrate visible

This patch makes clk_default_setrate and clk_ops_def_setrate available to code outside plat-samsung clock code.

---
 arch/arm/plat-s5pc1xx/clock.c              |   16 +++-------------
 arch/arm/plat-samsung/clock.c              |    4 ++--
 arch/arm/plat-samsung/include/plat/clock.h |    3 +++
 3 files changed, 8 insertions(+), 15 deletions(-)
arch/arm/plat-s5pc1xx/clock.c +3 -13
index cc21a8b..aec0305 100644
@@ -64,16 +64,6 @@ struct clk clk_54m = {
 	.rate		= 54000000,
 };
 
-static int clk_default_setrate(struct clk *clk, unsigned long rate)
-{
-	clk->rate = rate;
-	return 0;
-}
-
-static struct clk_ops clk_ops_default_setrate = {
-	.set_rate	= clk_default_setrate,
-};
-
 static int clk_dummy_enable(struct clk *clk, int enable)
 {
 	return 0;
@@ -86,7 +76,7 @@ struct clk clk_hd0 = {
 	.parent		= NULL,
 	.ctrlbit	= 0,
 	.enable		= clk_dummy_enable,
-	.ops		= &clk_ops_default_setrate,
+	.ops		= &clk_ops_def_setrate,
 };
 
 struct clk clk_pd0 = {
@@ -95,7 +85,7 @@ struct clk clk_pd0 = {
 	.rate		= 0,
 	.parent		= NULL,
 	.ctrlbit	= 0,
-	.ops		= &clk_ops_default_setrate,
+	.ops		= &clk_ops_def_setrate,
 	.enable		= clk_dummy_enable,
 };
 
@@ -705,7 +695,7 @@ void __init s5pc1xx_register_clocks(void)
 	s3c24xx_register_clocks(clks, ARRAY_SIZE(clks));
 
 	s3c_register_clocks(s5pc100_init_clocks,
-			    ARRAY_SIZE(s5pc100_init_clocks);
+			    ARRAY_SIZE(s5pc100_init_clocks));
 
 	clkp = s5pc100_init_clocks_disable;
 	size = ARRAY_SIZE(s5pc100_init_clocks_disable);
arch/arm/plat-samsung/clock.c +2 -2
index 9194af9..0c746ae 100644
@@ -225,13 +225,13 @@ EXPORT_SYMBOL(clk_set_parent);
 
 /* base clocks */
 
-static int clk_default_setrate(struct clk *clk, unsigned long rate)
+int clk_default_setrate(struct clk *clk, unsigned long rate)
 {
 	clk->rate = rate;
 	return 0;
 }
 
-static struct clk_ops clk_ops_def_setrate = {
+struct clk_ops clk_ops_def_setrate = {
 	.set_rate	= clk_default_setrate,
 };
 
arch/arm/plat-samsung/include/plat/clock.h +3 -0
index bd41f82..22e0114 100644
@@ -75,6 +75,9 @@ extern struct clk clk_h2;
 extern struct clk clk_27m;
 extern struct clk clk_48m;
 
+extern int clk_default_setrate(struct clk *clk, unsigned long rate);
+extern struct clk_ops clk_ops_def_setrate;
+
 /* exports for arch/arm/mach-s3c2410
  *
  * Please DO NOT use these outside of arch/arm/mach-s3c2410
Signature · 1 line
1.6.2.5
Applied
#1 lore raw

PATCH v2 2/3 ARM: SAMSUNG: Make clk_default_setrate and clk_ops_def_setrate visible

Quoted 2 lines · Kukjin Kim

This patch makes clk_default_setrate and clk_ops_def_setrate available to code outside plat-samsung clock code.

Thanks, applied to next-samsung-clock.

Quoted 98 lines
---
 arch/arm/plat-s5pc1xx/clock.c              |   16 +++-------------
 arch/arm/plat-samsung/clock.c              |    4 ++--
 arch/arm/plat-samsung/include/plat/clock.h |    3 +++
 3 files changed, 8 insertions(+), 15 deletions(-)
arch/arm/plat-s5pc1xx/clock.c +3 -13
index cc21a8b..aec0305 100644
@@ -64,16 +64,6 @@ struct clk clk_54m = {
 	.rate		= 54000000,
 };
 
-static int clk_default_setrate(struct clk *clk, unsigned long rate)
-{
-	clk->rate = rate;
-	return 0;
-}
-
-static struct clk_ops clk_ops_default_setrate = {
-	.set_rate	= clk_default_setrate,
-};
-
 static int clk_dummy_enable(struct clk *clk, int enable)
 {
 	return 0;
@@ -86,7 +76,7 @@ struct clk clk_hd0 = {
 	.parent		= NULL,
 	.ctrlbit	= 0,
 	.enable		= clk_dummy_enable,
-	.ops		= &clk_ops_default_setrate,
+	.ops		= &clk_ops_def_setrate,
 };
 
 struct clk clk_pd0 = {
@@ -95,7 +85,7 @@ struct clk clk_pd0 = {
 	.rate		= 0,
 	.parent		= NULL,
 	.ctrlbit	= 0,
-	.ops		= &clk_ops_default_setrate,
+	.ops		= &clk_ops_def_setrate,
 	.enable		= clk_dummy_enable,
 };
 
@@ -705,7 +695,7 @@ void __init s5pc1xx_register_clocks(void)
 	s3c24xx_register_clocks(clks, ARRAY_SIZE(clks));
 
 	s3c_register_clocks(s5pc100_init_clocks,
-			    ARRAY_SIZE(s5pc100_init_clocks);
+			    ARRAY_SIZE(s5pc100_init_clocks));
 
 	clkp = s5pc100_init_clocks_disable;
 	size = ARRAY_SIZE(s5pc100_init_clocks_disable);
arch/arm/plat-samsung/clock.c +2 -2
index 9194af9..0c746ae 100644
@@ -225,13 +225,13 @@ EXPORT_SYMBOL(clk_set_parent);
 
 /* base clocks */
 
-static int clk_default_setrate(struct clk *clk, unsigned long rate)
+int clk_default_setrate(struct clk *clk, unsigned long rate)
 {
 	clk->rate = rate;
 	return 0;
 }
 
-static struct clk_ops clk_ops_def_setrate = {
+struct clk_ops clk_ops_def_setrate = {
 	.set_rate	= clk_default_setrate,
 };
 
arch/arm/plat-samsung/include/plat/clock.h +3 -0
index bd41f82..22e0114 100644
@@ -75,6 +75,9 @@ extern struct clk clk_h2;
 extern struct clk clk_27m;
 extern struct clk clk_48m;
 
+extern int clk_default_setrate(struct clk *clk, unsigned long rate);
+extern struct clk_ops clk_ops_def_setrate;
+
 /* exports for arch/arm/mach-s3c2410
  *
  * Please DO NOT use these outside of arch/arm/mach-s3c2410
Signature · 7 lines
1.6.2.5


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Signature · 5 lines
-- 
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.