Merge tag 'apparmor-pr-2021-11-10' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / of / unittest.c

diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c
index b8d2b66..481ba86 100644 (file)
--- a/drivers/of/unittest.c
+++ b/drivers/of/unittest.c
@@ -1129,6 +1129,12 @@ static void __init of_unittest_parse_interrupts_extended(void)
                        passed &= (args.args[1] == 14);
                        break;
                case 6:
+                       /*
+                        * Tests child node that is missing property
+                        * #address-cells.  See the comments in
+                        * drivers/of/unittest-data/tests-interrupts.dtsi
+                        * nodes intmap1 and interrupts-extended0
+                        */
                        passed &= !rc;
                        passed &= (args.args_count == 1);
                        passed &= (args.args[0] == 15);
@@ -1688,19 +1694,19 @@ static void __init of_unittest_overlay_gpio(void)
         */
 
        EXPECT_BEGIN(KERN_INFO,
-                    "GPIO line <<int>> (line-B-input) hogged as input\n");
+                    "gpio-<<int>> (line-B-input): hogged as input\n");
 
        EXPECT_BEGIN(KERN_INFO,
-                    "GPIO line <<int>> (line-A-input) hogged as input\n");
+                    "gpio-<<int>> (line-A-input): hogged as input\n");
 
        ret = platform_driver_register(&unittest_gpio_driver);
        if (unittest(ret == 0, "could not register unittest gpio driver\n"))
                return;
 
        EXPECT_END(KERN_INFO,
-                  "GPIO line <<int>> (line-A-input) hogged as input\n");
+                  "gpio-<<int>> (line-A-input): hogged as input\n");
        EXPECT_END(KERN_INFO,
-                  "GPIO line <<int>> (line-B-input) hogged as input\n");
+                  "gpio-<<int>> (line-B-input): hogged as input\n");
 
        unittest(probe_pass_count + 2 == unittest_gpio_probe_pass_count,
                 "unittest_gpio_probe() failed or not called\n");
@@ -1727,7 +1733,7 @@ static void __init of_unittest_overlay_gpio(void)
        chip_request_count = unittest_gpio_chip_request_count;
 
        EXPECT_BEGIN(KERN_INFO,
-                    "GPIO line <<int>> (line-D-input) hogged as input\n");
+                    "gpio-<<int>> (line-D-input): hogged as input\n");
 
        /* overlay_gpio_03 contains gpio node and child gpio hog node */
 
@@ -1735,7 +1741,7 @@ static void __init of_unittest_overlay_gpio(void)
                 "Adding overlay 'overlay_gpio_03' failed\n");
 
        EXPECT_END(KERN_INFO,
-                  "GPIO line <<int>> (line-D-input) hogged as input\n");
+                  "gpio-<<int>> (line-D-input): hogged as input\n");
 
        unittest(probe_pass_count + 1 == unittest_gpio_probe_pass_count,
                 "unittest_gpio_probe() failed or not called\n");
@@ -1774,7 +1780,7 @@ static void __init of_unittest_overlay_gpio(void)
         */
 
        EXPECT_BEGIN(KERN_INFO,
-                    "GPIO line <<int>> (line-C-input) hogged as input\n");
+                    "gpio-<<int>> (line-C-input): hogged as input\n");
 
        /* overlay_gpio_04b contains child gpio hog node */
 
@@ -1782,7 +1788,7 @@ static void __init of_unittest_overlay_gpio(void)
                 "Adding overlay 'overlay_gpio_04b' failed\n");
 
        EXPECT_END(KERN_INFO,
-                  "GPIO line <<int>> (line-C-input) hogged as input\n");
+                  "gpio-<<int>> (line-C-input): hogged as input\n");
 
        unittest(chip_request_count + 1 == unittest_gpio_chip_request_count,
                 "unittest_gpio_chip_request() called %d times (expected 1 time)\n",