S3C2443/S3C2416: remove XXX_setup_clocks methods

A patch from »S3C24XX: unclutter clock init, mostly for S3C2443« in state Mainline for linux-kernel

From: Heiko Stuebner <heiko@...> Date: Wed, 11 Jan 2012 14:24:11 +0100

Commit-Message

s3c2443_common_setup_clocks is always called through s3c2443_common_init_clocks, so there is no need to call it separately. On the S3C2443 it was also called twice. Signed-off-by: Heiko Stuebner <heiko@...>

Patch-Comment

arch/arm/mach-s3c2416/clock.c | 6 ------ arch/arm/mach-s3c2443/clock.c | 7 ------- arch/arm/plat-samsung/include/plat/clock.h | 1 - 3 files changed, 0 insertions(+), 14 deletions(-)

Statistics

  • 0 lines added
  • 14 lines removed

Changes

------------------------ arch/arm/mach-s3c2416/clock.c -------------------------
index 59f54d1..e01490d 100644
@@ -132,12 +132,6 @@ static struct clk hsmmc0_clk = {
.ctrlbit = S3C2416_HCLKCON_HSMMC0,
};
-void __init_or_cpufreq s3c2416_setup_clocks(void)
-{
- s3c2443_common_setup_clocks(s3c2416_get_pll);
-}
-
-
static struct clksrc_clk *clksrcs[] __initdata = {
&hsspi_eplldiv,
&hsspi_mux,
------------------------ arch/arm/mach-s3c2443/clock.c -------------------------
index 6dde269..efb3ac3 100644
@@ -179,11 +179,6 @@ static struct clk *clks[] __initdata = {
&clk_hsmmc,
};
-void __init_or_cpufreq s3c2443_setup_clocks(void)
-{
- s3c2443_common_setup_clocks(s3c2443_get_mpll);
-}
-
void __init s3c2443_init_clocks(int xtal)
{
unsigned long epllcon = __raw_readl(S3C2443_EPLLCON);
@@ -196,8 +191,6 @@ void __init s3c2443_init_clocks(int xtal)
armdiv, ARRAY_SIZE(armdiv),
S3C2443_CLKDIV0_ARMDIV_MASK);
- s3c2443_setup_clocks();
-
s3c24xx_register_clocks(clks, ARRAY_SIZE(clks));
for (ptr = 0; ptr < ARRAY_SIZE(clksrcs); ptr++)
------------------ arch/arm/plat-samsung/include/plat/clock.h ------------------
index 73c66d4..58b42f6 100644
@@ -114,7 +114,6 @@ extern void s3c24xx_setup_clocks(unsigned long fclk,
extern void s3c2410_setup_clocks(void);
extern void s3c2412_setup_clocks(void);
extern void s3c244x_setup_clocks(void);
-extern void s3c2443_setup_clocks(void);
/* S3C64XX specific functions and clocks */
 
 

Recent Patches

About Us

Sed lacus. Donec lectus. Nullam pretium nibh ut turpis. Nam bibendum. In nulla tortor, elementum vel, tempor at, varius non, purus. Mauris vitae nisl nec metus placerat consectetuer.

Read More...