Skip to contentSkip to conversation

ARM: mach-shmobile: rename clk_init() to shmobile_clk_init()

PATCH Applied Magnus Damm 2 participants 3 messages Feb 29, 2012 – Mar 7, 2012

Subsystems (4)
Arm (32-bit) Arm sub-architectures SuperH Arm/RISC-V/Renesas architecture
lore
Share & tools
lore

Magnus Damm

author maintainer
#0 lore raw

PATCH 1/1 ARM: mach-shmobile: rename clk_init() to shmobile_clk_init()

From: Magnus Damm <[email protected]>

Rename clk_init() to shmobile_clk_init() to avoid a potential future name space collision with the common clock framework.

Signed-off-by Magnus Damm <[email protected]>

---

 arch/arm/mach-shmobile/clock-r8a7740.c       |    2 +-
 arch/arm/mach-shmobile/clock-r8a7779.c       |    2 +-
 arch/arm/mach-shmobile/clock-sh7367.c        |    2 +-
 arch/arm/mach-shmobile/clock-sh7372.c        |    2 +-
 arch/arm/mach-shmobile/clock-sh7377.c        |    2 +-
 arch/arm/mach-shmobile/clock-sh73a0.c        |    2 +-
 arch/arm/mach-shmobile/clock.c               |    2 +-
 arch/arm/mach-shmobile/include/mach/common.h |    2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)
arch/arm/mach-shmobile/clock-r8a7740.c +1 -1
@@ -376,7 +376,7 @@ void __init r8a7740_clock_init(u8 md_ck)
 	clkdev_add_table(lookups, ARRAY_SIZE(lookups));
 
 	if (!ret)
-		clk_init();
+		shmobile_clk_init();
 	else
 		panic("failed to setup r8a7740 clocks\n");
 }
arch/arm/mach-shmobile/clock-r8a7779.c +1 -1
@@ -170,7 +170,7 @@ void __init r8a7779_clock_init(void)
 	clkdev_add_table(lookups, ARRAY_SIZE(lookups));
 
 	if (!ret)
-		clk_init();
+		shmobile_clk_init();
 	else
 		panic("failed to setup r8a7779 clocks\n");
 }
arch/arm/mach-shmobile/clock-sh7367.c +1 -1
@@ -349,7 +349,7 @@ void __init sh7367_clock_init(void)
 	clkdev_add_table(lookups, ARRAY_SIZE(lookups));
 
 	if (!ret)
-		clk_init();
+		shmobile_clk_init();
 	else
 		panic("failed to setup sh7367 clocks\n");
 }
arch/arm/mach-shmobile/clock-sh7372.c +1 -1
@@ -710,7 +710,7 @@ void __init sh7372_clock_init(void)
 	clkdev_add_table(lookups, ARRAY_SIZE(lookups));
 
 	if (!ret)
-		clk_init();
+		shmobile_clk_init();
 	else
 		panic("failed to setup sh7372 clocks\n");
arch/arm/mach-shmobile/clock-sh7377.c +1 -1
@@ -360,7 +360,7 @@ void __init sh7377_clock_init(void)
 	clkdev_add_table(lookups, ARRAY_SIZE(lookups));
 
 	if (!ret)
-		clk_init();
+		shmobile_clk_init();
 	else
 		panic("failed to setup sh7377 clocks\n");
 }
arch/arm/mach-shmobile/clock-sh73a0.c +1 -1
@@ -620,7 +620,7 @@ void __init sh73a0_clock_init(void)
 	clkdev_add_table(lookups, ARRAY_SIZE(lookups));
 
 	if (!ret)
-		clk_init();
+		shmobile_clk_init();
 	else
 		panic("failed to setup sh73a0 clocks\n");
 }
arch/arm/mach-shmobile/clock.c +1 -1
@@ -24,7 +24,7 @@
 #include <linux/sh_clk.h>
 #include <linux/export.h>
 
-int __init clk_init(void)
+int __init shmobile_clk_init(void)
 {
 	/* Kick the child clocks.. */
 	recalculate_root_clocks();
arch/arm/mach-shmobile/include/mach/common.h +1 -1
@@ -6,7 +6,7 @@ extern void shmobile_setup_console(void)
 extern void shmobile_secondary_vector(void);
 extern int shmobile_platform_cpu_kill(unsigned int cpu);
 struct clk;
-extern int clk_init(void);
+extern int shmobile_clk_init(void);
 extern void shmobile_handle_irq_intc(struct pt_regs *);
 extern struct platform_suspend_ops shmobile_suspend_ops;
 struct cpuidle_driver;
#1 lore raw
Quoted 6 lines · Magnus Damm

From: Magnus Damm <[email protected]>

Rename clk_init() to shmobile_clk_init() to avoid a potential future name space collision with the common clock framework.

Signed-off-by Magnus Damm <[email protected]>

Paul, would you mind if I took this patchset into the renesas tree for v3.4?

Rafael

Quoted 102 lines

---

 arch/arm/mach-shmobile/clock-r8a7740.c       |    2 +-
 arch/arm/mach-shmobile/clock-r8a7779.c       |    2 +-
 arch/arm/mach-shmobile/clock-sh7367.c        |    2 +-
 arch/arm/mach-shmobile/clock-sh7372.c        |    2 +-
 arch/arm/mach-shmobile/clock-sh7377.c        |    2 +-
 arch/arm/mach-shmobile/clock-sh73a0.c        |    2 +-
 arch/arm/mach-shmobile/clock.c               |    2 +-
 arch/arm/mach-shmobile/include/mach/common.h |    2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)
arch/arm/mach-shmobile/clock-r8a7740.c +1 -1
@@ -376,7 +376,7 @@ void __init r8a7740_clock_init(u8 md_ck)
 	clkdev_add_table(lookups, ARRAY_SIZE(lookups));
 
 	if (!ret)
-		clk_init();
+		shmobile_clk_init();
 	else
 		panic("failed to setup r8a7740 clocks\n");
 }
arch/arm/mach-shmobile/clock-r8a7779.c +1 -1
@@ -170,7 +170,7 @@ void __init r8a7779_clock_init(void)
 	clkdev_add_table(lookups, ARRAY_SIZE(lookups));
 
 	if (!ret)
-		clk_init();
+		shmobile_clk_init();
 	else
 		panic("failed to setup r8a7779 clocks\n");
 }
arch/arm/mach-shmobile/clock-sh7367.c +1 -1
@@ -349,7 +349,7 @@ void __init sh7367_clock_init(void)
 	clkdev_add_table(lookups, ARRAY_SIZE(lookups));
 
 	if (!ret)
-		clk_init();
+		shmobile_clk_init();
 	else
 		panic("failed to setup sh7367 clocks\n");
 }
arch/arm/mach-shmobile/clock-sh7372.c +1 -1
@@ -710,7 +710,7 @@ void __init sh7372_clock_init(void)
 	clkdev_add_table(lookups, ARRAY_SIZE(lookups));
 
 	if (!ret)
-		clk_init();
+		shmobile_clk_init();
 	else
 		panic("failed to setup sh7372 clocks\n");
arch/arm/mach-shmobile/clock-sh7377.c +1 -1
@@ -360,7 +360,7 @@ void __init sh7377_clock_init(void)
 	clkdev_add_table(lookups, ARRAY_SIZE(lookups));
 
 	if (!ret)
-		clk_init();
+		shmobile_clk_init();
 	else
 		panic("failed to setup sh7377 clocks\n");
 }
arch/arm/mach-shmobile/clock-sh73a0.c +1 -1
@@ -620,7 +620,7 @@ void __init sh73a0_clock_init(void)
 	clkdev_add_table(lookups, ARRAY_SIZE(lookups));
 
 	if (!ret)
-		clk_init();
+		shmobile_clk_init();
 	else
 		panic("failed to setup sh73a0 clocks\n");
 }
arch/arm/mach-shmobile/clock.c +1 -1
@@ -24,7 +24,7 @@
 #include <linux/sh_clk.h>
 #include <linux/export.h>
 
-int __init clk_init(void)
+int __init shmobile_clk_init(void)
 {
 	/* Kick the child clocks.. */
 	recalculate_root_clocks();
arch/arm/mach-shmobile/include/mach/common.h +1 -1
@@ -6,7 +6,7 @@ extern void shmobile_setup_console(void)
 extern void shmobile_secondary_vector(void);
 extern int shmobile_platform_cpu_kill(unsigned int cpu);
 struct clk;
-extern int clk_init(void);
+extern int shmobile_clk_init(void);
 extern void shmobile_handle_irq_intc(struct pt_regs *);
 extern struct platform_suspend_ops shmobile_suspend_ops;
 struct cpuidle_driver;
Applied
#2 lore raw
In reply to Magnus Damm
Quoted 6 lines · Magnus Damm

From: Magnus Damm <[email protected]>

Rename clk_init() to shmobile_clk_init() to avoid a potential future name space collision with the common clock framework.

Signed-off-by Magnus Damm <[email protected]>

Applied.

Thanks,
Rafael

Quoted 102 lines

---

 arch/arm/mach-shmobile/clock-r8a7740.c       |    2 +-
 arch/arm/mach-shmobile/clock-r8a7779.c       |    2 +-
 arch/arm/mach-shmobile/clock-sh7367.c        |    2 +-
 arch/arm/mach-shmobile/clock-sh7372.c        |    2 +-
 arch/arm/mach-shmobile/clock-sh7377.c        |    2 +-
 arch/arm/mach-shmobile/clock-sh73a0.c        |    2 +-
 arch/arm/mach-shmobile/clock.c               |    2 +-
 arch/arm/mach-shmobile/include/mach/common.h |    2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)
arch/arm/mach-shmobile/clock-r8a7740.c +1 -1
@@ -376,7 +376,7 @@ void __init r8a7740_clock_init(u8 md_ck)
 	clkdev_add_table(lookups, ARRAY_SIZE(lookups));
 
 	if (!ret)
-		clk_init();
+		shmobile_clk_init();
 	else
 		panic("failed to setup r8a7740 clocks\n");
 }
arch/arm/mach-shmobile/clock-r8a7779.c +1 -1
@@ -170,7 +170,7 @@ void __init r8a7779_clock_init(void)
 	clkdev_add_table(lookups, ARRAY_SIZE(lookups));
 
 	if (!ret)
-		clk_init();
+		shmobile_clk_init();
 	else
 		panic("failed to setup r8a7779 clocks\n");
 }
arch/arm/mach-shmobile/clock-sh7367.c +1 -1
@@ -349,7 +349,7 @@ void __init sh7367_clock_init(void)
 	clkdev_add_table(lookups, ARRAY_SIZE(lookups));
 
 	if (!ret)
-		clk_init();
+		shmobile_clk_init();
 	else
 		panic("failed to setup sh7367 clocks\n");
 }
arch/arm/mach-shmobile/clock-sh7372.c +1 -1
@@ -710,7 +710,7 @@ void __init sh7372_clock_init(void)
 	clkdev_add_table(lookups, ARRAY_SIZE(lookups));
 
 	if (!ret)
-		clk_init();
+		shmobile_clk_init();
 	else
 		panic("failed to setup sh7372 clocks\n");
arch/arm/mach-shmobile/clock-sh7377.c +1 -1
@@ -360,7 +360,7 @@ void __init sh7377_clock_init(void)
 	clkdev_add_table(lookups, ARRAY_SIZE(lookups));
 
 	if (!ret)
-		clk_init();
+		shmobile_clk_init();
 	else
 		panic("failed to setup sh7377 clocks\n");
 }
arch/arm/mach-shmobile/clock-sh73a0.c +1 -1
@@ -620,7 +620,7 @@ void __init sh73a0_clock_init(void)
 	clkdev_add_table(lookups, ARRAY_SIZE(lookups));
 
 	if (!ret)
-		clk_init();
+		shmobile_clk_init();
 	else
 		panic("failed to setup sh73a0 clocks\n");
 }
arch/arm/mach-shmobile/clock.c +1 -1
@@ -24,7 +24,7 @@
 #include <linux/sh_clk.h>
 #include <linux/export.h>
 
-int __init clk_init(void)
+int __init shmobile_clk_init(void)
 {
 	/* Kick the child clocks.. */
 	recalculate_root_clocks();
arch/arm/mach-shmobile/include/mach/common.h +1 -1
@@ -6,7 +6,7 @@ extern void shmobile_setup_console(void)
 extern void shmobile_secondary_vector(void);
 extern int shmobile_platform_cpu_kill(unsigned int cpu);
 struct clk;
-extern int clk_init(void);
+extern int shmobile_clk_init(void);
 extern void shmobile_handle_irq_intc(struct pt_regs *);
 extern struct platform_suspend_ops shmobile_suspend_ops;
 struct cpuidle_driver;