OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Magnus Damm 2012-02-29 21:41:30 +09:00 committed by Rafael J. Wysocki
parent 8bac13f591
commit 6b6a4c067c
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-shmobile/clock-r8a7740.c
View File

@ -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");
}

2
arch/arm/mach-shmobile/clock-r8a7779.c
View File

@ -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");
}

2
arch/arm/mach-shmobile/clock-sh7367.c
View File

@ -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");
}

2
arch/arm/mach-shmobile/clock-sh7372.c
View File

@ -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");

2
arch/arm/mach-shmobile/clock-sh7377.c
View File

@ -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");
}

2
arch/arm/mach-shmobile/clock-sh73a0.c
View File

@ -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");
}

2
arch/arm/mach-shmobile/clock.c
View File

@ -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();

2
arch/arm/mach-shmobile/include/mach/common.h
View File

@ -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;