From mboxrd@z Thu Jan 1 00:00:00 1970 From: sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth) Date: Thu, 26 Sep 2013 08:21:27 +0200 Subject: [PATCH 12/26] ARM: exynos: remove custom .init_time hook In-Reply-To: <1379526839-14798-13-git-send-email-sebastian.hesselbarth@gmail.com> References: <1379526839-14798-1-git-send-email-sebastian.hesselbarth@gmail.com> <1379526839-14798-13-git-send-email-sebastian.hesselbarth@gmail.com> Message-ID: <5243D267.3010704@gmail.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 09/18/2013 07:53 PM, Sebastian Hesselbarth wrote: > With arch/arm calling of_clk_init(NULL) from time_init(), we can now > remove custom .init_time hooks. While at it, also remove some now > redundant includes. > > Signed-off-by: Sebastian Hesselbarth > --- Ping, Kukjin can you please comment on this patch? Thanks! > Cc: Olof Johansson > Cc: Arnd Bergmann > Cc: Russell King > Cc: Kukjin Kim > Cc: linux-arm-kernel at lists.infradead.org > Cc: linux-samsung-soc at vger.kernel.org > Cc: linux-kernel at vger.kernel.org > --- > arch/arm/mach-exynos/common.c | 8 -------- > arch/arm/mach-exynos/common.h | 1 - > arch/arm/mach-exynos/mach-exynos4-dt.c | 2 -- > arch/arm/mach-exynos/mach-exynos5-dt.c | 2 -- > 4 files changed, 13 deletions(-) > > diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c > index ba95e5d..a4e7ba8 100644 > --- a/arch/arm/mach-exynos/common.c > +++ b/arch/arm/mach-exynos/common.c > @@ -26,8 +26,6 @@ > #include > #include > #include > -#include > -#include > #include > #include > > @@ -367,12 +365,6 @@ static void __init exynos5_map_io(void) > iotable_init(exynos5250_iodesc, ARRAY_SIZE(exynos5250_iodesc)); > } > > -void __init exynos_init_time(void) > -{ > - of_clk_init(NULL); > - clocksource_of_init(); > -} > - > struct bus_type exynos_subsys = { > .name = "exynos-core", > .dev_name = "exynos-core", > diff --git a/arch/arm/mach-exynos/common.h b/arch/arm/mach-exynos/common.h > index 8646a14..f0fa205 100644 > --- a/arch/arm/mach-exynos/common.h > +++ b/arch/arm/mach-exynos/common.h > @@ -16,7 +16,6 @@ > #include > > void mct_init(void __iomem *base, int irq_g0, int irq_l0, int irq_l1); > -void exynos_init_time(void); > > struct map_desc; > void exynos_init_io(void); > diff --git a/arch/arm/mach-exynos/mach-exynos4-dt.c b/arch/arm/mach-exynos/mach-exynos4-dt.c > index 0099c6c..6858d73 100644 > --- a/arch/arm/mach-exynos/mach-exynos4-dt.c > +++ b/arch/arm/mach-exynos/mach-exynos4-dt.c > @@ -16,7 +16,6 @@ > #include > #include > #include > -#include > > #include > #include > @@ -54,7 +53,6 @@ DT_MACHINE_START(EXYNOS4210_DT, "Samsung Exynos4 (Flattened Device Tree)") > .init_early = exynos_firmware_init, > .init_machine = exynos4_dt_machine_init, > .init_late = exynos_init_late, > - .init_time = exynos_init_time, > .dt_compat = exynos4_dt_compat, > .restart = exynos4_restart, > .reserve = exynos4_reserve, > diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c > index f874b77..bac2105 100644 > --- a/arch/arm/mach-exynos/mach-exynos5-dt.c > +++ b/arch/arm/mach-exynos/mach-exynos5-dt.c > @@ -13,7 +13,6 @@ > #include > #include > #include > -#include > > #include > #include > @@ -76,7 +75,6 @@ DT_MACHINE_START(EXYNOS5_DT, "SAMSUNG EXYNOS5 (Flattened Device Tree)") > .map_io = exynos_init_io, > .init_machine = exynos5_dt_machine_init, > .init_late = exynos_init_late, > - .init_time = exynos_init_time, > .dt_compat = exynos5_dt_compat, > .restart = exynos5_restart, > .reserve = exynos5_reserve, >