diff options
| author | Rob Herring <robh@kernel.org> | 2015-02-11 21:28:45 -0600 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2015-02-11 21:28:45 -0600 |
| commit | 3c3c8e3618b018aee1dfd42343a74f3ab5ddf23c (patch) | |
| tree | 7a2053d24f8c10e4621b18df13130a9bcf02a4a3 /drivers/of | |
| parent | ffe24b28ebff32da00e53f9d18b289b8bf233373 (diff) | |
| parent | fca8ba4ee24d17f8845ed1c8edcc3fd81c4650c2 (diff) | |
| download | linux-3c3c8e3618b018aee1dfd42343a74f3ab5ddf23c.tar.gz linux-3c3c8e3618b018aee1dfd42343a74f3ab5ddf23c.tar.bz2 linux-3c3c8e3618b018aee1dfd42343a74f3ab5ddf23c.zip | |
Merge remote-tracking branch 'grant/devicetree/next' into for-next
Diffstat (limited to 'drivers/of')
| -rw-r--r-- | drivers/of/unittest.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c index e86213b0e7e5..0cf9a236d438 100644 --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c @@ -30,11 +30,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) { \ @@ -833,13 +828,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; @@ -902,10 +890,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"); |