diff options
author | Rob Herring <robh@kernel.org> | 2014-05-13 10:07:29 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-02-19 23:27:15 +0900 |
commit | b0c0283496dc772b005dda5e38d956917bbd1f16 (patch) | |
tree | d8c2618709bf8e81fc0e812e71aa0f8b842d2469 | |
parent | b8524c272b6fef2df4dbb0b6306188946ab4f75c (diff) |
of/selftest: clean-up of_selftest_platform_populate pass/fail handling
Move the pass/fail checks into selftest() calls instead of a separate if
condition. Unconditionally calling pass was wrong.
Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Grant Likely <grant.likely@linaro.org>
(cherry picked from commit 7d1cdc89c54d2cb8157cf1f36fc65e8583d26484)
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | drivers/of/selftest.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/of/selftest.c b/drivers/of/selftest.c index fe70b86bcffb..c1d7d38009f1 100644 --- a/drivers/of/selftest.c +++ b/drivers/of/selftest.c @@ -440,22 +440,18 @@ static void __init of_selftest_platform_populate(void) /* Test that a missing irq domain returns -EPROBE_DEFER */ np = of_find_node_by_path("/testcase-data/testcase-device1"); pdev = of_find_device_by_node(np); - if (!pdev) - selftest(0, "device 1 creation failed\n"); + selftest(pdev, "device 1 creation failed\n"); + irq = platform_get_irq(pdev, 0); - if (irq != -EPROBE_DEFER) - selftest(0, "device deferred probe failed - %d\n", irq); + selftest(irq == -EPROBE_DEFER, "device deferred probe failed - %d\n", irq); /* Test that a parsing failure does not return -EPROBE_DEFER */ np = of_find_node_by_path("/testcase-data/testcase-device2"); pdev = of_find_device_by_node(np); - if (!pdev) - selftest(0, "device 2 creation failed\n"); + selftest(pdev, "device 2 creation failed\n"); irq = platform_get_irq(pdev, 0); - if (irq >= 0 || irq == -EPROBE_DEFER) - selftest(0, "device parsing error failed - %d\n", irq); + selftest(irq < 0 && irq != -EPROBE_DEFER, "device parsing error failed - %d\n", irq); - selftest(1, "passed"); } static int __init of_selftest(void) |