diff options
author | Kefeng Wang <wangkefeng.wang@huawei.com> | 2016-06-01 02:53:10 -0400 |
---|---|---|
committer | Rob Herring <robh@kernel.org> | 2016-06-23 16:00:59 -0400 |
commit | 146dedbcabd89461faaa85a82e50b2fdd6b24683 (patch) | |
tree | d235933a317917547155598fb61ef4cd306f33d6 | |
parent | 9f2c519c9f27d804b54422afd31a17335b32a556 (diff) |
of: unittest: use of_platform_default_populate() to populate default bus
Use helper of_platform_default_populate() in linux/of_platform
when possible, instead of calling of_platform_populate() with
the default match table.
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Frank Rowand <frowand.list@gmail.com>
Cc: Grant Likely <grant.likely@linaro.org>
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: Rob Herring <robh@kernel.org>
-rw-r--r-- | drivers/of/unittest.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c index f34ed9310323..53c83d66eb7e 100644 --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c | |||
@@ -771,7 +771,7 @@ static void __init of_unittest_platform_populate(void) | |||
771 | }; | 771 | }; |
772 | 772 | ||
773 | np = of_find_node_by_path("/testcase-data"); | 773 | np = of_find_node_by_path("/testcase-data"); |
774 | of_platform_populate(np, of_default_bus_match_table, NULL, NULL); | 774 | of_platform_default_populate(np, NULL, NULL); |
775 | 775 | ||
776 | /* Test that a missing irq domain returns -EPROBE_DEFER */ | 776 | /* Test that a missing irq domain returns -EPROBE_DEFER */ |
777 | np = of_find_node_by_path("/testcase-data/testcase-device1"); | 777 | np = of_find_node_by_path("/testcase-data/testcase-device1"); |
@@ -1871,8 +1871,7 @@ static void __init of_unittest_overlay(void) | |||
1871 | goto out; | 1871 | goto out; |
1872 | } | 1872 | } |
1873 | 1873 | ||
1874 | ret = of_platform_populate(bus_np, of_default_bus_match_table, | 1874 | ret = of_platform_default_populate(bus_np, NULL, NULL); |
1875 | NULL, NULL); | ||
1876 | if (ret != 0) { | 1875 | if (ret != 0) { |
1877 | unittest(0, "could not populate bus @ \"%s\"\n", bus_path); | 1876 | unittest(0, "could not populate bus @ \"%s\"\n", bus_path); |
1878 | goto out; | 1877 | goto out; |