Skip to content

Commit

Permalink
of/unittest: Remove obsolete code
Browse files Browse the repository at this point in the history
Commit 3ce04b4, "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: Grant Likely <grant.likely@linaro.org>
Cc: Gaurav Minocha <gaurav.minocha.os@gmail.com>
Cc: Rob Herring <robh@kernel.org>
  • Loading branch information
Grant Likely committed Jan 22, 2015
1 parent e94fbe6 commit fca8ba4
Showing 1 changed file with 0 additions and 15 deletions.
15 changes: 0 additions & 15 deletions drivers/of/unittest.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) { \
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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");
Expand Down

0 comments on commit fca8ba4

Please sign in to comment.