diff options
author | Reza Arbab <arbab@linux.vnet.ibm.com> | 2016-10-13 13:45:30 -0500 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2017-01-30 16:49:30 +1100 |
commit | 7656cd8e8e23ac4b059f4d96939cb73eb3121ae9 (patch) | |
tree | 233ee8de4b8a662aada9907f43ca58300ec298df /arch/powerpc/mm/numa.c | |
parent | f2a5e8f0023eba847ad2adb145b2f631934bb12b (diff) | |
download | linux-stable-7656cd8e8e23ac4b059f4d96939cb73eb3121ae9.tar.gz linux-stable-7656cd8e8e23ac4b059f4d96939cb73eb3121ae9.tar.bz2 linux-stable-7656cd8e8e23ac4b059f4d96939cb73eb3121ae9.zip |
powerpc/mm: Simplify loop control in parse_numa_properties()
The flow of the main loop in parse_numa_properties() is overly
complicated. Simplify it to be less confusing and easier to read.
No functional change.
The end of the main loop in parse_numa_properties() looks like this:
for_each_node_by_type(...) {
...
if (!condition) {
if (--ranges)
goto new_range;
else
continue;
}
statement();
if (--ranges)
goto new_range;
/* else
* continue; <- implicit, this is the end of the loop
*/
}
The only effect of !condition is to skip execution of statement(). This
can be rewritten in a simpler way:
for_each_node_by_type(...) {
...
if (condition)
statement();
if (--ranges)
goto new_range;
}
Signed-off-by: Reza Arbab <arbab@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/mm/numa.c')
-rw-r--r-- | arch/powerpc/mm/numa.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c index b1099cb2f393..51fe1c5b6d71 100644 --- a/arch/powerpc/mm/numa.c +++ b/arch/powerpc/mm/numa.c @@ -786,14 +786,9 @@ new_range: fake_numa_create_new_node(((start + size) >> PAGE_SHIFT), &nid); node_set_online(nid); - if (!(size = numa_enforce_memory_limit(start, size))) { - if (--ranges) - goto new_range; - else - continue; - } - - memblock_set_node(start, size, &memblock.memory, nid); + size = numa_enforce_memory_limit(start, size); + if (size) + memblock_set_node(start, size, &memblock.memory, nid); if (--ranges) goto new_range; |