diff options
author | Arnd Bergmann <arnd@arndb.de> | 2013-06-18 12:35:22 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2013-06-18 12:37:51 -0400 |
commit | 1a522f284fd924adea291960784c6fc27d2a61cb (patch) | |
tree | 8a630f4a288b3e16f71dd3a0a59d7f7e2369c9d7 | |
parent | da36952595597d86cdeb61d8ca908fab3b4de294 (diff) |
ARM: EXYNOS: Remove custom init_irq callbacks
Since both exynos4_init_irq() and exynos5_init_irq() are just calling
irqchip_init(), there is no need for them to exist any more, since this
is the default that is called when init_irq callback is not specified.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
-rw-r--r-- | arch/arm/mach-exynos/common.c | 10 | ||||
-rw-r--r-- | arch/arm/mach-exynos/common.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-exynos/mach-exynos4-dt.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-exynos/mach-exynos5-dt.c | 1 |
4 files changed, 0 insertions, 14 deletions
diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c index 7b53e4c8460f..91d457fc016a 100644 --- a/arch/arm/mach-exynos/common.c +++ b/arch/arm/mach-exynos/common.c | |||
@@ -400,16 +400,6 @@ void __init exynos_init_time(void) | |||
400 | clocksource_of_init(); | 400 | clocksource_of_init(); |
401 | } | 401 | } |
402 | 402 | ||
403 | void __init exynos4_init_irq(void) | ||
404 | { | ||
405 | irqchip_init(); | ||
406 | } | ||
407 | |||
408 | void __init exynos5_init_irq(void) | ||
409 | { | ||
410 | irqchip_init(); | ||
411 | } | ||
412 | |||
413 | struct bus_type exynos_subsys = { | 403 | struct bus_type exynos_subsys = { |
414 | .name = "exynos-core", | 404 | .name = "exynos-core", |
415 | .dev_name = "exynos-core", | 405 | .dev_name = "exynos-core", |
diff --git a/arch/arm/mach-exynos/common.h b/arch/arm/mach-exynos/common.h index 11fc1e29819b..1c83f95fd3c3 100644 --- a/arch/arm/mach-exynos/common.h +++ b/arch/arm/mach-exynos/common.h | |||
@@ -20,8 +20,6 @@ extern unsigned long xxti_f, xusbxti_f; | |||
20 | 20 | ||
21 | struct map_desc; | 21 | struct map_desc; |
22 | void exynos_init_io(struct map_desc *mach_desc, int size); | 22 | void exynos_init_io(struct map_desc *mach_desc, int size); |
23 | void exynos4_init_irq(void); | ||
24 | void exynos5_init_irq(void); | ||
25 | void exynos4_restart(char mode, const char *cmd); | 23 | void exynos4_restart(char mode, const char *cmd); |
26 | void exynos5_restart(char mode, const char *cmd); | 24 | void exynos5_restart(char mode, const char *cmd); |
27 | void exynos_init_late(void); | 25 | void exynos_init_late(void); |
diff --git a/arch/arm/mach-exynos/mach-exynos4-dt.c b/arch/arm/mach-exynos/mach-exynos4-dt.c index b9ed834a7eee..df1572675ace 100644 --- a/arch/arm/mach-exynos/mach-exynos4-dt.c +++ b/arch/arm/mach-exynos/mach-exynos4-dt.c | |||
@@ -55,7 +55,6 @@ static void __init exynos4_reserve(void) | |||
55 | DT_MACHINE_START(EXYNOS4210_DT, "Samsung Exynos4 (Flattened Device Tree)") | 55 | DT_MACHINE_START(EXYNOS4210_DT, "Samsung Exynos4 (Flattened Device Tree)") |
56 | /* Maintainer: Thomas Abraham <thomas.abraham@linaro.org> */ | 56 | /* Maintainer: Thomas Abraham <thomas.abraham@linaro.org> */ |
57 | .smp = smp_ops(exynos_smp_ops), | 57 | .smp = smp_ops(exynos_smp_ops), |
58 | .init_irq = exynos4_init_irq, | ||
59 | .map_io = exynos4_dt_map_io, | 58 | .map_io = exynos4_dt_map_io, |
60 | .init_early = exynos_firmware_init, | 59 | .init_early = exynos_firmware_init, |
61 | .init_machine = exynos4_dt_machine_init, | 60 | .init_machine = exynos4_dt_machine_init, |
diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c index 753b94f3fca7..c73d01c965c5 100644 --- a/arch/arm/mach-exynos/mach-exynos5-dt.c +++ b/arch/arm/mach-exynos/mach-exynos5-dt.c | |||
@@ -76,7 +76,6 @@ static void __init exynos5_reserve(void) | |||
76 | 76 | ||
77 | DT_MACHINE_START(EXYNOS5_DT, "SAMSUNG EXYNOS5 (Flattened Device Tree)") | 77 | DT_MACHINE_START(EXYNOS5_DT, "SAMSUNG EXYNOS5 (Flattened Device Tree)") |
78 | /* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */ | 78 | /* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */ |
79 | .init_irq = exynos5_init_irq, | ||
80 | .smp = smp_ops(exynos_smp_ops), | 79 | .smp = smp_ops(exynos_smp_ops), |
81 | .map_io = exynos5_dt_map_io, | 80 | .map_io = exynos5_dt_map_io, |
82 | .init_machine = exynos5_dt_machine_init, | 81 | .init_machine = exynos5_dt_machine_init, |