UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

arm64: make dt_scan_depth1_nodes more readable 

Improve the readability of dt_scan_depth1_nodes by removing the nested
conditionals.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Stefano Stabellini <sstabellini@kernel.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
This commit is contained in:
Mark Rutland 2016-04-25 11:25:11 +01:00 committed by Will Deacon
parent 2366c7fdb5
commit 9981293fb0
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
arch/arm64/kernel/acpi.c
View File

@ -66,17 +66,24 @@ static int __init dt_scan_depth1_nodes(unsigned long node,
void *data) void *data)
{ {
/* /*
* Return 1 as soon as we encounter a node at depth 1 that is * Ignore anything not directly under the root node; we'll
* not the /chosen node, or /hypervisor node with compatible * catch its parent instead.
* string "xen,xen".
*/ */
if (depth == 1 && (strcmp(uname, "chosen") != 0)) { if (depth != 1)
if (strcmp(uname, "hypervisor") != 0 || return 0;
!of_flat_dt_is_compatible(node, "xen,xen"))
return 1;
}
return 0; if (strcmp(uname, "chosen") == 0)
return 0;
if (strcmp(uname, "hypervisor") == 0 &&
of_flat_dt_is_compatible(node, "xen,xen"))
return 0;
/*
* This node at depth 1 is neither a chosen node nor a xen node,
* which we do not expect.
*/
return 1;
} }
/* /*