Skip to content

Commit 7d1cdc8

Browse files
committed
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 <[email protected]> Cc: Grant Likely <[email protected]>
1 parent d9c6866 commit 7d1cdc8

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

drivers/of/selftest.c

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -440,22 +440,18 @@ static void __init of_selftest_platform_populate(void)
440440
/* Test that a missing irq domain returns -EPROBE_DEFER */
441441
np = of_find_node_by_path("/testcase-data/testcase-device1");
442442
pdev = of_find_device_by_node(np);
443-
if (!pdev)
444-
selftest(0, "device 1 creation failed\n");
443+
selftest(pdev, "device 1 creation failed\n");
444+
445445
irq = platform_get_irq(pdev, 0);
446-
if (irq != -EPROBE_DEFER)
447-
selftest(0, "device deferred probe failed - %d\n", irq);
446+
selftest(irq == -EPROBE_DEFER, "device deferred probe failed - %d\n", irq);
448447

449448
/* Test that a parsing failure does not return -EPROBE_DEFER */
450449
np = of_find_node_by_path("/testcase-data/testcase-device2");
451450
pdev = of_find_device_by_node(np);
452-
if (!pdev)
453-
selftest(0, "device 2 creation failed\n");
451+
selftest(pdev, "device 2 creation failed\n");
454452
irq = platform_get_irq(pdev, 0);
455-
if (irq >= 0 || irq == -EPROBE_DEFER)
456-
selftest(0, "device parsing error failed - %d\n", irq);
453+
selftest(irq < 0 && irq != -EPROBE_DEFER, "device parsing error failed - %d\n", irq);
457454

458-
selftest(1, "passed");
459455
}
460456

461457
static int __init of_selftest(void)

0 commit comments

Comments
 (0)