of: unittest: drop assertions for GPIO hog messages

PATCH In review Bartosz Golaszewski 3 participants 5 messages Jun 9, 2023 – Jun 15, 2023

Subsystems (2)

GPIO Device tree

lore

Share & tools

lore

Bartosz Golaszewski

author

2023-06-09 14:36 UTC #0 lore raw

PATCH 1/1 of: unittest: drop assertions for GPIO hog messages

From: Bartosz Golaszewski <[email protected]>

These have now been demoted to debug and are normally hidden. Drop the assertions entirely.

Signed-off-by Bartosz Golaszewski <[email protected]>

---
 drivers/of/unittest.c | 28 ----------------------------
 1 file changed, 28 deletions(-)

drivers/of/unittest.c +0 ~~-28~~

index 0060334a98a7..5386efeaf710 100644
@@ -1844,26 +1844,10 @@ static void __init of_unittest_overlay_gpio(void)
 	unittest(overlay_data_apply("overlay_gpio_02b", NULL),
 		 "Adding overlay 'overlay_gpio_02b' failed\n");
 
-	/*
-	 * messages are the result of the probes, after the
-	 * driver is registered
-	 */
-
-	EXPECT_BEGIN(KERN_DEBUG,
-		     "gpio-<<int>> (line-B-input): hogged as input\n");
-
-	EXPECT_BEGIN(KERN_DEBUG,
-		     "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_DEBUG,
-		   "gpio-<<int>> (line-A-input): hogged as input\n");
-	EXPECT_END(KERN_DEBUG,
-		   "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");

@@ -1888,17 +1872,11 @@ static void __init of_unittest_overlay_gpio(void)
 	probe_pass_count = unittest_gpio_probe_pass_count;
 	chip_request_count = unittest_gpio_chip_request_count;
 
-	EXPECT_BEGIN(KERN_DEBUG,
-		     "gpio-<<int>> (line-D-input): hogged as input\n");
-
 	/* overlay_gpio_03 contains gpio node and child gpio hog node */
 
 	unittest(overlay_data_apply("overlay_gpio_03", NULL),
 		 "Adding overlay 'overlay_gpio_03' failed\n");
 
-	EXPECT_END(KERN_DEBUG,
-		   "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");

@@ -1935,17 +1913,11 @@ static void __init of_unittest_overlay_gpio(void)
 	 *   - processing gpio for overlay_gpio_04b
 	 */
 
-	EXPECT_BEGIN(KERN_DEBUG,
-		     "gpio-<<int>> (line-C-input): hogged as input\n");
-
 	/* overlay_gpio_04b contains child gpio hog node */
 
 	unittest(overlay_data_apply("overlay_gpio_04b", NULL),
 		 "Adding overlay 'overlay_gpio_04b' failed\n");
 
-	EXPECT_END(KERN_DEBUG,
-		   "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",
 		 unittest_gpio_chip_request_count - chip_request_count);

Signature · 1 line

2.39.2

Andy Shevchenko

Acked-by on v1 1/1

2023-06-09 14:41 UTC #1 lore raw

Quoted 4 lines · Bartosz Golaszewski

From: Bartosz Golaszewski <[email protected]>
These have now been demoted to debug and are normally hidden. Drop the assertions entirely.

Acked-by Andy Shevchenko <[email protected]>

Quoted 76 lines

Signed-off-by Bartosz Golaszewski <[email protected]>

---
 drivers/of/unittest.c | 28 ----------------------------
 1 file changed, 28 deletions(-)

drivers/of/unittest.c +0 ~~-28~~

index 0060334a98a7..5386efeaf710 100644
@@ -1844,26 +1844,10 @@ static void __init of_unittest_overlay_gpio(void)
 	unittest(overlay_data_apply("overlay_gpio_02b", NULL),
 		 "Adding overlay 'overlay_gpio_02b' failed\n");
 
-	/*
-	 * messages are the result of the probes, after the
-	 * driver is registered
-	 */
-
-	EXPECT_BEGIN(KERN_DEBUG,
-		     "gpio-<<int>> (line-B-input): hogged as input\n");
-
-	EXPECT_BEGIN(KERN_DEBUG,
-		     "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_DEBUG,
-		   "gpio-<<int>> (line-A-input): hogged as input\n");
-	EXPECT_END(KERN_DEBUG,
-		   "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");

@@ -1888,17 +1872,11 @@ static void __init of_unittest_overlay_gpio(void)
 	probe_pass_count = unittest_gpio_probe_pass_count;
 	chip_request_count = unittest_gpio_chip_request_count;
 
-	EXPECT_BEGIN(KERN_DEBUG,
-		     "gpio-<<int>> (line-D-input): hogged as input\n");
-
 	/* overlay_gpio_03 contains gpio node and child gpio hog node */
 
 	unittest(overlay_data_apply("overlay_gpio_03", NULL),
 		 "Adding overlay 'overlay_gpio_03' failed\n");
 
-	EXPECT_END(KERN_DEBUG,
-		   "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");

@@ -1935,17 +1913,11 @@ static void __init of_unittest_overlay_gpio(void)
 	 *   - processing gpio for overlay_gpio_04b
 	 */
 
-	EXPECT_BEGIN(KERN_DEBUG,
-		     "gpio-<<int>> (line-C-input): hogged as input\n");
-
 	/* overlay_gpio_04b contains child gpio hog node */
 
 	unittest(overlay_data_apply("overlay_gpio_04b", NULL),
 		 "Adding overlay 'overlay_gpio_04b' failed\n");
 
-	EXPECT_END(KERN_DEBUG,
-		   "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",
 		 unittest_gpio_chip_request_count - chip_request_count);

Signature · 1 line

2.39.2

Signature · 2 lines

With Best Regards,
Andy Shevchenko

Rob Herring

2023-06-09 17:01 UTC #2 lore raw

In reply to Bartosz Golaszewski

Quoted 11 lines · Bartosz Golaszewski

From: Bartosz Golaszewski <[email protected]>
These have now been demoted to debug and are normally hidden. Drop the assertions entirely.
Suggested-by Rob Herring <[email protected]>
Signed-off-by Bartosz Golaszewski <[email protected]>
---
 drivers/of/unittest.c | 28 ----------------------------
 1 file changed, 28 deletions(-)

Why is this a separate patch? Don't I get at least 5 days to review/ack changes in drivers/of/?

Rob

Bartosz Golaszewski

author

2023-06-09 20:15 UTC #3 lore raw

Quoted 8 lines · Rob Herring

Quoted 6 lines · Bartosz Golaszewski
From: Bartosz Golaszewski <[email protected]>
These have now been demoted to debug and are normally hidden. Drop the assertions entirely.

Quoted 9 lines

Quoted 5 lines
Suggested-by Rob Herring <[email protected]>
Signed-off-by Bartosz Golaszewski <[email protected]>
---
 drivers/of/unittest.c | 28 ----------------------------
 1 file changed, 28 deletions(-)
Why is this a separate patch? Don't I get at least 5 days to review/ack changes in drivers/of/?

Sorry, my bad, I queued the previous one through the GPIO tree after it was reviewed here thinking the unittests bits are trivial. I can back it out if you insist or you can ack this one and the end effect is the same? I will pay attention in the future.

Bart

Rob Herring

Acked-by

2023-06-15 14:10 UTC #4 lore raw

Quoted 16 lines · Bartosz Golaszewski

Quoted 14 lines · Rob Herring
Quoted 11 lines · Bartosz Golaszewski
From: Bartosz Golaszewski <[email protected]>
These have now been demoted to debug and are normally hidden. Drop the assertions entirely.
Suggested-by Rob Herring <[email protected]>
Signed-off-by Bartosz Golaszewski <[email protected]>
---
 drivers/of/unittest.c | 28 ----------------------------
 1 file changed, 28 deletions(-)

Quoted 8 lines

Quoted 3 lines
Why is this a separate patch? Don't I get at least 5 days to review/ack changes in drivers/of/?
Sorry, my bad, I queued the previous one through the GPIO tree after it was reviewed here thinking the unittests bits are trivial. I can back it out if you insist or you can ack this one and the end effect is the same? I will pay attention in the future.

I'd prefer it to be squashed, but either way:

Acked-by Rob Herring <[email protected]>