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

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 <damm@opensource.se>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>

diff --git a/arch/arm/mach-shmobile/clock-r8a7740.c b/arch/arm/mach-shmobile/clock-r8a7740.c
index 6a406844c3decdce8a73bd515215fbe10584bb91..99c4d743a99c41a5d0e9206e4967e7e80417d44d 100644 (file)
--- a/arch/arm/mach-shmobile/clock-r8a7740.c
+++ b/arch/arm/mach-shmobile/clock-r8a7740.c
@@ -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");
 }

diff --git a/arch/arm/mach-shmobile/clock-r8a7779.c b/arch/arm/mach-shmobile/clock-r8a7779.c
index 317ab525ce20b200b763250ad3827cb990ca68f1..7d6e9fe47b56a812e7fbb7c1343da1eb9d045141 100644 (file)
--- a/arch/arm/mach-shmobile/clock-r8a7779.c
+++ b/arch/arm/mach-shmobile/clock-r8a7779.c
@@ -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");
 }

diff --git a/arch/arm/mach-shmobile/clock-sh7367.c b/arch/arm/mach-shmobile/clock-sh7367.c
index b6d6ba88b46f637cdb89278c8805794b4cf6619c..006e7b5d304c36207780ebbcde9f34a833ea2605 100644 (file)
--- a/arch/arm/mach-shmobile/clock-sh7367.c
+++ b/arch/arm/mach-shmobile/clock-sh7367.c
@@ -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");
 }

diff --git a/arch/arm/mach-shmobile/clock-sh7372.c b/arch/arm/mach-shmobile/clock-sh7372.c
index 3acdb714edf7e622615d3f70a2880ab705bb0962..de243e3c83929311753e47f0dc1dc1d495e88761 100644 (file)
--- a/arch/arm/mach-shmobile/clock-sh7372.c
+++ b/arch/arm/mach-shmobile/clock-sh7372.c
@@ -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");
 

diff --git a/arch/arm/mach-shmobile/clock-sh7377.c b/arch/arm/mach-shmobile/clock-sh7377.c
index 081ecee1fae77da2b8190bd60204a3829fa5ca37..0798a15936c3cc41a6d51c70e909503d3f02afd8 100644 (file)
--- a/arch/arm/mach-shmobile/clock-sh7377.c
+++ b/arch/arm/mach-shmobile/clock-sh7377.c
@@ -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");
 }

diff --git a/arch/arm/mach-shmobile/clock-sh73a0.c b/arch/arm/mach-shmobile/clock-sh73a0.c
index e5b24bfc04df3f64887209703f1e9632131054cc..472d1f5361e5390a58ecde58966c075d0532bf6d 100644 (file)
--- a/arch/arm/mach-shmobile/clock-sh73a0.c
+++ b/arch/arm/mach-shmobile/clock-sh73a0.c
@@ -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");
 }

diff --git a/arch/arm/mach-shmobile/clock.c b/arch/arm/mach-shmobile/clock.c
index 31654d78b96b6331b8edaaf3a6576f043de408ae..e816ca9bd2131949e8847d82ba6028ceb147282c 100644 (file)
--- a/arch/arm/mach-shmobile/clock.c
+++ b/arch/arm/mach-shmobile/clock.c
@@ -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();

diff --git a/arch/arm/mach-shmobile/include/mach/common.h b/arch/arm/mach-shmobile/include/mach/common.h
index c1b77d588bb3dbab2b59464ac8ef45fe4fc1677c..f005ac0e4621c0f526e140293003f90e649d3d6c 100644 (file)
--- a/arch/arm/mach-shmobile/include/mach/common.h
+++ b/arch/arm/mach-shmobile/include/mach/common.h
@@ -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;