Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f874913 authored by Grant Likely's avatar Grant Likely Committed by Alex Shi
Browse files

of/unittest: Remove obsolete code 



Commit 3ce04b4a9, "Removes OF_UNITTEST dependency on OF_DYNAMIC config
symbol" removes a bunch of code, but missed a few minor bits. Clean it
up by removing the node removal cache and flag.

Signed-off-by: default avatarGrant Likely <grant.likely@linaro.org>
Cc: Gaurav Minocha <gaurav.minocha.os@gmail.com>
Cc: Rob Herring <robh@kernel.org>
(cherry picked from commit fca8ba4ee24d17f8845ed1c8edcc3fd81c4650c2)
Signed-off-by: default avatarAlex Shi <alex.shi@linaro.org>
parent 6dd54590

drivers/of/unittest.c

+0 −15
Original line number Diff line number Diff line
@@ -27,11 +27,6 @@ static struct selftest_results { 
	int failed;

} selftest_results;



#define NO_OF_NODES 3

static struct device_node *nodes[NO_OF_NODES];

static int last_node_index;

static bool selftest_live_tree;



#define selftest(result, fmt, ...) ({ \

	bool failed = !(result); \

	if (failed) { \
@@ -830,13 +825,6 @@ static int attach_node_and_children(struct device_node *np) 
		return 0;

	}



	/* Children of the root need to be remembered for removal */

	if (np->parent == of_root) {

		if (WARN_ON(last_node_index >= NO_OF_NODES))

			return -EINVAL;

		nodes[last_node_index++] = np;

	}



	child = np->child;

	np->child = NULL;
@@ -899,10 +887,7 @@ static int __init selftest_data_add(void) 
	}



	if (!of_root) {

		/* enabling flag for removing nodes */

		selftest_live_tree = true;

		of_root = selftest_data_node;



		for_each_of_allnodes(np)

			__of_attach_node_sysfs(np);

		of_aliases = of_find_node_by_path("/aliases");