* [PATCH next] PM: runtime: Fix error checking for kunit_device_register()
@ 2025-10-03 9:29 Dan Carpenter
2025-10-03 17:02 ` Brian Norris
0 siblings, 1 reply; 3+ messages in thread
From: Dan Carpenter @ 2025-10-03 9:29 UTC (permalink / raw)
To: Brian Norris
Cc: Rafael J. Wysocki, Pavel Machek, Len Brown, Greg Kroah-Hartman,
Danilo Krummrich, linux-pm, linux-kernel, kernel-janitors
The kunit_device_register() function never returns NULL, it returns
error pointers. Update the assertions to use
KUNIT_ASSERT_NOT_ERR_OR_NULL() instead of checking for NULL.
Fixes: 7f7acd193ba8 ("PM: runtime: Add basic kunit tests for API contracts")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
---
drivers/base/power/runtime-test.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/base/power/runtime-test.c b/drivers/base/power/runtime-test.c
index eca9885e807d..477feca804c7 100644
--- a/drivers/base/power/runtime-test.c
+++ b/drivers/base/power/runtime-test.c
@@ -14,7 +14,7 @@ static void pm_runtime_depth_test(struct kunit *test)
{
struct device *dev = kunit_device_register(test, DEVICE_NAME);
- KUNIT_ASSERT_PTR_NE(test, NULL, dev);
+ KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dev);
pm_runtime_enable(dev);
@@ -32,7 +32,7 @@ static void pm_runtime_already_suspended_test(struct kunit *test)
{
struct device *dev = kunit_device_register(test, DEVICE_NAME);
- KUNIT_ASSERT_PTR_NE(test, NULL, dev);
+ KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dev);
pm_runtime_enable(dev);
KUNIT_EXPECT_TRUE(test, pm_runtime_suspended(dev));
@@ -70,7 +70,7 @@ static void pm_runtime_idle_test(struct kunit *test)
{
struct device *dev = kunit_device_register(test, DEVICE_NAME);
- KUNIT_ASSERT_PTR_NE(test, NULL, dev);
+ KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dev);
pm_runtime_enable(dev);
@@ -91,7 +91,7 @@ static void pm_runtime_disabled_test(struct kunit *test)
{
struct device *dev = kunit_device_register(test, DEVICE_NAME);
- KUNIT_ASSERT_PTR_NE(test, NULL, dev);
+ KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dev);
/* Never called pm_runtime_enable() */
KUNIT_EXPECT_FALSE(test, pm_runtime_enabled(dev));
@@ -131,7 +131,7 @@ static void pm_runtime_error_test(struct kunit *test)
{
struct device *dev = kunit_device_register(test, DEVICE_NAME);
- KUNIT_ASSERT_PTR_NE(test, NULL, dev);
+ KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dev);
pm_runtime_enable(dev);
KUNIT_EXPECT_TRUE(test, pm_runtime_suspended(dev));
@@ -214,7 +214,7 @@ static void pm_runtime_probe_active_test(struct kunit *test)
{
struct device *dev = kunit_device_register(test, DEVICE_NAME);
- KUNIT_ASSERT_PTR_NE(test, NULL, dev);
+ KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dev);
KUNIT_EXPECT_TRUE(test, pm_runtime_status_suspended(dev));
--
2.51.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH next] PM: runtime: Fix error checking for kunit_device_register()
2025-10-03 9:29 [PATCH next] PM: runtime: Fix error checking for kunit_device_register() Dan Carpenter
@ 2025-10-03 17:02 ` Brian Norris
2025-10-03 19:14 ` Rafael J. Wysocki
0 siblings, 1 reply; 3+ messages in thread
From: Brian Norris @ 2025-10-03 17:02 UTC (permalink / raw)
To: Dan Carpenter
Cc: Rafael J. Wysocki, Pavel Machek, Len Brown, Greg Kroah-Hartman,
Danilo Krummrich, linux-pm, linux-kernel, kernel-janitors
On Fri, Oct 03, 2025 at 12:29:31PM +0300, Dan Carpenter wrote:
> The kunit_device_register() function never returns NULL, it returns
> error pointers. Update the assertions to use
> KUNIT_ASSERT_NOT_ERR_OR_NULL() instead of checking for NULL.
>
> Fixes: 7f7acd193ba8 ("PM: runtime: Add basic kunit tests for API contracts")
> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Thanks for the catch:
Reviewed-by: Brian Norris <briannorris@chromium.org>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH next] PM: runtime: Fix error checking for kunit_device_register()
2025-10-03 17:02 ` Brian Norris
@ 2025-10-03 19:14 ` Rafael J. Wysocki
0 siblings, 0 replies; 3+ messages in thread
From: Rafael J. Wysocki @ 2025-10-03 19:14 UTC (permalink / raw)
To: Brian Norris, Dan Carpenter
Cc: Pavel Machek, Len Brown, Greg Kroah-Hartman, Danilo Krummrich,
linux-pm, linux-kernel, kernel-janitors
On Fri, Oct 3, 2025 at 7:02 PM Brian Norris <briannorris@chromium.org> wrote:
>
> On Fri, Oct 03, 2025 at 12:29:31PM +0300, Dan Carpenter wrote:
> > The kunit_device_register() function never returns NULL, it returns
> > error pointers. Update the assertions to use
> > KUNIT_ASSERT_NOT_ERR_OR_NULL() instead of checking for NULL.
> >
> > Fixes: 7f7acd193ba8 ("PM: runtime: Add basic kunit tests for API contracts")
> > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
>
> Thanks for the catch:
>
> Reviewed-by: Brian Norris <briannorris@chromium.org>
Applied, thanks!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-10-03 19:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-10-03 9:29 [PATCH next] PM: runtime: Fix error checking for kunit_device_register() Dan Carpenter
2025-10-03 17:02 ` Brian Norris
2025-10-03 19:14 ` Rafael J. Wysocki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox