of/selftest: clean-up of_selftest_platform_populate pass/fail handling
PATCH 1/1 of/selftest: clean-up of_selftest_platform_populate pass/fail handling
From: Rob Herring <[email protected]>
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]>
--- drivers/of/selftest.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)
drivers/of/selftest.c +5 -9
@@ -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 )
Signature · 6 lines
1.9.1 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 7 lines · Rob Herring
From: Rob Herring <[email protected]>
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]>
Acked-by Grant Likely <[email protected]>
Quoted 39 lines
--- drivers/of/selftest.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)drivers/of/selftest.c +5
-9@@ -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 )Signature · 1 line
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html