aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Shiyan <shc_work@mail.ru>2014-06-19 11:26:37 -0400
committerOlof Johansson <olof@lixom.net>2014-07-06 19:52:24 -0400
commit402277e0f8d33ff22fcaaa9b71d49f2e9929364b (patch)
treeafd6cee389124027593528a690cd2a7ed7feccd0
parent862391640535b5820fd09648a914771fc47b9451 (diff)
ARM: clps711x: edb7211: Remove excess layer to calling clps711x_devices_init()
clps711x_devices_init() can be used directly in ".machine_init" without any intermediate function. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r--arch/arm/mach-clps711x/board-edb7211.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/mach-clps711x/board-edb7211.c b/arch/arm/mach-clps711x/board-edb7211.c
index 7ad94ff1da28..e6e06099d052 100644
--- a/arch/arm/mach-clps711x/board-edb7211.c
+++ b/arch/arm/mach-clps711x/board-edb7211.c
@@ -148,11 +148,6 @@ fixup_edb7211(struct tag *tags, char **cmdline)
148 memblock_add(0xc1000000, SZ_8M); 148 memblock_add(0xc1000000, SZ_8M);
149} 149}
150 150
151static void __init edb7211_init(void)
152{
153 clps711x_devices_init();
154}
155
156static void __init edb7211_init_late(void) 151static void __init edb7211_init_late(void)
157{ 152{
158 gpio_request_array(edb7211_gpios, ARRAY_SIZE(edb7211_gpios)); 153 gpio_request_array(edb7211_gpios, ARRAY_SIZE(edb7211_gpios));
@@ -180,7 +175,7 @@ MACHINE_START(EDB7211, "CL-EDB7211 (EP7211 eval board)")
180 .map_io = clps711x_map_io, 175 .map_io = clps711x_map_io,
181 .init_irq = clps711x_init_irq, 176 .init_irq = clps711x_init_irq,
182 .init_time = clps711x_timer_init, 177 .init_time = clps711x_timer_init,
183 .init_machine = edb7211_init, 178 .init_machine = clps711x_devices_init,
184 .init_late = edb7211_init_late, 179 .init_late = edb7211_init_late,
185 .restart = clps711x_restart, 180 .restart = clps711x_restart,
186MACHINE_END 181MACHINE_END