diff options
author | 2014-11-14 15:33:07 +0000 | |
---|---|---|
committer | 2014-11-24 22:23:35 +0000 | |
commit | ef8bbd73a76197cf8362a2b43aaadc5717bd0746 (patch) | |
tree | 85e5d8b9e98a1d7c2ac6c42e698dec4ac21a98b8 /drivers/of/unittest.c | |
parent | Merge tag 'v3.18-rc6' into devicetree/next (diff) | |
download | linux-ef8bbd73a76197cf8362a2b43aaadc5717bd0746.tar.gz linux-ef8bbd73a76197cf8362a2b43aaadc5717bd0746.tar.bz2 linux-ef8bbd73a76197cf8362a2b43aaadc5717bd0746.zip |
of: Use vargs in __of_node_alloc
The overlay code needs to construct a new full_name from the parent name
and the node name, but the current method has to allocate and then free
an temporary string which is wasteful. Fix this problem by using vargs
to pass in a format and arguments into __of_node_alloc().
At the same time remove the allocflags argument to __of_node_alloc().
The only users all use GFP_KERNEL, so there is no need to provide it as
an option. If there is ever a need later it can be added back.
Signed-off-by: Grant Likely <grant.likely@linaro.org>
Diffstat (limited to 'drivers/of/unittest.c')
-rw-r--r-- | drivers/of/unittest.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c index 46af7019d291..7634a17af1d5 100644 --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c @@ -449,11 +449,11 @@ static void __init of_selftest_changeset(void) struct of_changeset chgset; of_changeset_init(&chgset); - n1 = __of_node_alloc("/testcase-data/changeset/n1", GFP_KERNEL); + n1 = __of_node_alloc("/testcase-data/changeset/n1"); selftest(n1, "testcase setup failure\n"); - n2 = __of_node_alloc("/testcase-data/changeset/n2", GFP_KERNEL); + n2 = __of_node_alloc("/testcase-data/changeset/n2"); selftest(n2, "testcase setup failure\n"); - n21 = __of_node_alloc("/testcase-data/changeset/n2/n21", GFP_KERNEL); + n21 = __of_node_alloc("/testcase-data/changeset/n2/n21"); selftest(n21, "testcase setup failure %p\n", n21); nremove = of_find_node_by_path("/testcase-data/changeset/node-remove"); selftest(nremove, "testcase setup failure\n"); |