Skip to content

Commit 92158fa

Browse files
Dan Carpenterrafaeljw
authored andcommitted
PM: runtime: Fix error checking for kunit_device_register()
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: 7f7acd1 ("PM: runtime: Add basic kunit tests for API contracts") Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> Reviewed-by: Brian Norris <briannorris@chromium.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent 384b52c commit 92158fa

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

drivers/base/power/runtime-test.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ static void pm_runtime_depth_test(struct kunit *test)
1414
{
1515
struct device *dev = kunit_device_register(test, DEVICE_NAME);
1616

17-
KUNIT_ASSERT_PTR_NE(test, NULL, dev);
17+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dev);
1818

1919
pm_runtime_enable(dev);
2020

@@ -32,7 +32,7 @@ static void pm_runtime_already_suspended_test(struct kunit *test)
3232
{
3333
struct device *dev = kunit_device_register(test, DEVICE_NAME);
3434

35-
KUNIT_ASSERT_PTR_NE(test, NULL, dev);
35+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dev);
3636

3737
pm_runtime_enable(dev);
3838
KUNIT_EXPECT_TRUE(test, pm_runtime_suspended(dev));
@@ -70,7 +70,7 @@ static void pm_runtime_idle_test(struct kunit *test)
7070
{
7171
struct device *dev = kunit_device_register(test, DEVICE_NAME);
7272

73-
KUNIT_ASSERT_PTR_NE(test, NULL, dev);
73+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dev);
7474

7575
pm_runtime_enable(dev);
7676

@@ -91,7 +91,7 @@ static void pm_runtime_disabled_test(struct kunit *test)
9191
{
9292
struct device *dev = kunit_device_register(test, DEVICE_NAME);
9393

94-
KUNIT_ASSERT_PTR_NE(test, NULL, dev);
94+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dev);
9595

9696
/* Never called pm_runtime_enable() */
9797
KUNIT_EXPECT_FALSE(test, pm_runtime_enabled(dev));
@@ -131,7 +131,7 @@ static void pm_runtime_error_test(struct kunit *test)
131131
{
132132
struct device *dev = kunit_device_register(test, DEVICE_NAME);
133133

134-
KUNIT_ASSERT_PTR_NE(test, NULL, dev);
134+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dev);
135135

136136
pm_runtime_enable(dev);
137137
KUNIT_EXPECT_TRUE(test, pm_runtime_suspended(dev));
@@ -214,7 +214,7 @@ static void pm_runtime_probe_active_test(struct kunit *test)
214214
{
215215
struct device *dev = kunit_device_register(test, DEVICE_NAME);
216216

217-
KUNIT_ASSERT_PTR_NE(test, NULL, dev);
217+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dev);
218218

219219
KUNIT_EXPECT_TRUE(test, pm_runtime_status_suspended(dev));
220220

0 commit comments

Comments
 (0)