aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm64/kernel/setup.c
diff options
context:
space:
mode:
authorKefeng Wang <wangkefeng.wang@huawei.com>2016-06-01 02:52:57 -0400
committerRob Herring <robh@kernel.org>2016-06-23 15:59:16 -0400
commit9a4ef881d25957f149864bd46a2099e92ec9c53c (patch)
tree541aa1e23dc4b4ff65af10ac460ecfc1ba41a596 /arch/arm64/kernel/setup.c
parent850bea2335e42780a0752a75860d3fbcc3d12d6e (diff)
arm64: Remove unnecessary of_platform_populate with default match table
After patch "of/platform: Add common method to populate default bus", it is possible for arch code to remove unnecessary callers of of_platform_populate with default match table. Acked-by: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will.deacon@arm.com> Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'arch/arm64/kernel/setup.c')
-rw-r--r--arch/arm64/kernel/setup.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index 8412520ef62d..c907e2f8b516 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -40,7 +40,6 @@
40#include <linux/proc_fs.h> 40#include <linux/proc_fs.h>
41#include <linux/memblock.h> 41#include <linux/memblock.h>
42#include <linux/of_fdt.h> 42#include <linux/of_fdt.h>
43#include <linux/of_platform.h>
44#include <linux/efi.h> 43#include <linux/efi.h>
45#include <linux/psci.h> 44#include <linux/psci.h>
46 45
@@ -301,18 +300,6 @@ void __init setup_arch(char **cmdline_p)
301 } 300 }
302} 301}
303 302
304static int __init arm64_device_init(void)
305{
306 if (of_have_populated_dt()) {
307 of_platform_populate(NULL, of_default_bus_match_table,
308 NULL, NULL);
309 } else if (acpi_disabled) {
310 pr_crit("Device tree not populated\n");
311 }
312 return 0;
313}
314arch_initcall_sync(arm64_device_init);
315
316static int __init topology_init(void) 303static int __init topology_init(void)
317{ 304{
318 int i; 305 int i;