of: unittest: fix EXPECT text for gpio hog errors

BugLink: https://bugs.launchpad.net/bugs/1951822
[ Upstream commit e85860e5bc077865a04f0a88d0b0335d3200484a ]

The console message text for gpio hog errors does not match
what unittest expects.

Fixes: f4056e705b2ef ("of: unittest: add overlay gpio test to catch gpio hog problem")
Signed-off-by: Frank Rowand <frank.rowand@sony.com>
Link: https://lore.kernel.org/r/20211029013225.2048695-1-frowand.list@gmail.com
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>

diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c
index 8c056972a6ddc729a2f82331b6911f1c4d2ed070..5b85a2a3792ae31b9c9d8c35915d22ad6f65f0de 100644 (file)
--- a/drivers/of/unittest.c
+++ b/drivers/of/unittest.c
@@ -1688,19 +1688,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 +1727,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 +1735,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 +1774,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 +1782,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",