[PATCH 12/26] ARM: exynos: remove custom .init_time hook

Sebastian Hesselbarth sebastian.hesselbarth at gmail.com
Thu Sep 26 02:21:27 EDT 2013


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 <sebastian.hesselbarth at gmail.com>
> ---

Ping,

Kukjin can you please comment on this patch?

Thanks!

> Cc: Olof Johansson <olof at lixom.net>
> Cc: Arnd Bergmann <arnd at arndb.de>
> Cc: Russell King <linux at arm.linux.org.uk>
> Cc: Kukjin Kim <kgene.kim at samsung.com>
> 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 <linux/export.h>
>   #include <linux/irqdomain.h>
>   #include <linux/of_address.h>
> -#include <linux/clocksource.h>
> -#include <linux/clk-provider.h>
>   #include <linux/irqchip/arm-gic.h>
>   #include <linux/irqchip/chained_irq.h>
>
> @@ -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 <linux/of.h>
>
>   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 <linux/of_fdt.h>
>   #include <linux/serial_core.h>
>   #include <linux/memblock.h>
> -#include <linux/clocksource.h>
>
>   #include <asm/mach/arch.h>
>   #include <plat/mfc.h>
> @@ -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 <linux/of_fdt.h>
>   #include <linux/memblock.h>
>   #include <linux/io.h>
> -#include <linux/clocksource.h>
>
>   #include <asm/mach/arch.h>
>   #include <mach/regs-pmu.h>
> @@ -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,
>




More information about the linux-arm-kernel mailing list