AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

of/unittest: Fix of_platform_depopulate test case

Browse Source 
The previous commit, "of/unittest: early return from test skips tests"
exposed broken tests for the of_platform_unpopulate() function. The
problem was the populate and depopulate calls were not symmetrical like
they were intended to be, and unpopulate depends on the parent device to
have it's of_node pointer pointing to the parent device node. Fix these
bugs so that the test case works correctly.

In the process, the test_bus used as a container for the test devices
has been changed from a statically allocated struct device (which is
bad) to a properly allocated device with a .release() method (which is
good). This stops the test code from being a bad example of abusing the
device model.

Signed-off-by: Grant Likely <grant.likely@linaro.org>
Cc: Frank Rowand <frank.rowand@sonymobile.com>
Cc: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Cc: Pawel Moll <pawel.moll@arm.com>
This commit is contained in:
Grant Likely 2015-03-27 20:30:04 -07:00
parent 716e1d493a
commit 37791b6fbe
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/of/unittest.c
View File

@ -751,14 +751,14 @@ static void __init of_selftest_match_node(void)
}
}
struct device test_bus = {
.init_name = "unittest-bus",
static const struct platform_device_info test_bus_info = {
.name = "unittest-bus",
};
static void __init of_selftest_platform_populate(void)
{
int irq, rc;
struct device_node *np, *child, *grandchild;
struct platform_device *pdev;
struct platform_device *pdev, *test_bus;
const struct of_device_id match[] = {
{ .compatible = "test-device", },
{}
@ -787,20 +787,22 @@ static void __init of_selftest_platform_populate(void)
if (!np)
return;
rc = device_register(&test_bus);
test_bus = platform_device_register_full(&test_bus_info);
rc = PTR_ERR_OR_ZERO(test_bus);
selftest(!rc, "testbus registration failed; rc=%i\n", rc);
if (rc)
return;
test_bus->dev.of_node = np;
of_platform_populate(np, match, NULL, &test_bus->dev);
for_each_child_of_node(np, child) {
of_platform_populate(child, match, NULL, &test_bus);
for_each_child_of_node(child, grandchild)
selftest(of_find_device_by_node(grandchild),
"Could not create device for node '%s'\n",
grandchild->name);
}
of_platform_depopulate(&test_bus);
of_platform_depopulate(&test_bus->dev);
for_each_child_of_node(np, child) {
for_each_child_of_node(child, grandchild)
selftest(!of_find_device_by_node(grandchild),
@ -808,7 +810,7 @@ static void __init of_selftest_platform_populate(void)
grandchild->name);
}
device_unregister(&test_bus);
platform_device_unregister(test_bus);
of_node_put(np);
}