Commit 7656cd8e authored by Reza Arbab's avatar Reza Arbab Committed by Michael Ellerman

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: default avatarReza Arbab <arbab@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent f2a5e8f0
...@@ -786,13 +786,8 @@ static int __init parse_numa_properties(void) ...@@ -786,13 +786,8 @@ static int __init parse_numa_properties(void)
fake_numa_create_new_node(((start + size) >> PAGE_SHIFT), &nid); fake_numa_create_new_node(((start + size) >> PAGE_SHIFT), &nid);
node_set_online(nid); node_set_online(nid);
if (!(size = numa_enforce_memory_limit(start, size))) { size = numa_enforce_memory_limit(start, size);
if (--ranges) if (size)
goto new_range;
else
continue;
}
memblock_set_node(start, size, &memblock.memory, nid); memblock_set_node(start, size, &memblock.memory, nid);
if (--ranges) if (--ranges)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment