From: Alexander Shiyan Date: Thu, 19 Jun 2014 15:26:37 +0000 (+0400) Subject: ARM: clps711x: edb7211: Remove excess layer to calling clps711x_devices_init() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=402277e0f8d33ff22fcaaa9b71d49f2e9929364b;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git 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 Signed-off-by: Olof Johansson --- 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) memblock_add(0xc1000000, SZ_8M); } -static void __init edb7211_init(void) -{ - clps711x_devices_init(); -} - static void __init edb7211_init_late(void) { gpio_request_array(edb7211_gpios, ARRAY_SIZE(edb7211_gpios)); @@ -180,7 +175,7 @@ MACHINE_START(EDB7211, "CL-EDB7211 (EP7211 eval board)") .map_io = clps711x_map_io, .init_irq = clps711x_init_irq, .init_time = clps711x_timer_init, - .init_machine = edb7211_init, + .init_machine = clps711x_devices_init, .init_late = edb7211_init_late, .restart = clps711x_restart, MACHINE_END