[PATCH] kunit: device: Fix a NULL vs IS_ERR() check in init()

[Dan Carpenter]

The root_device_register() function does not return NULL, it returns
error pointers. Fix the check to match.

Fixes: d03c720e03bd ("kunit: Add APIs for managing devices")
Signed-off-by: Dan Carpenter <dan.ca...@linaro.org>
---
lib/kunit/device.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/kunit/device.c b/lib/kunit/device.c
index f5371287b375..074c6dd2e36a 100644
--- a/lib/kunit/device.c
+++ b/lib/kunit/device.c
@@ -45,8 +45,8 @@ int kunit_bus_init(void)
int error;

kunit_bus_device = root_device_register("kunit");
- if (!kunit_bus_device)
- return -ENOMEM;
+ if (IS_ERR(kunit_bus_device))
+ return PTR_ERR(kunit_bus_device);

error = bus_register(&kunit_bus_type);
if (error)
--
2.43.0

[Rae Moar]

On Wed, Jan 10, 2024 at 1:55 PM Dan Carpenter <dan.ca...@linaro.org> wrote:
>
> The root_device_register() function does not return NULL, it returns
> error pointers. Fix the check to match.
>
> Fixes: d03c720e03bd ("kunit: Add APIs for managing devices")
> Signed-off-by: Dan Carpenter <dan.ca...@linaro.org>

This change looks good to me! We could check for IS_ERR_OR_NULL
instead but this change is more correct and is also how others check
root_device_register().

Reviewed-by: Rae Moar <rm...@google.com>

Thanks!
Rae

> ---
> lib/kunit/device.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/lib/kunit/device.c b/lib/kunit/device.c
> index f5371287b375..074c6dd2e36a 100644
> --- a/lib/kunit/device.c
> +++ b/lib/kunit/device.c
> @@ -45,8 +45,8 @@ int kunit_bus_init(void)
> int error;
>
> kunit_bus_device = root_device_register("kunit");
> - if (!kunit_bus_device)
> - return -ENOMEM;
> + if (IS_ERR(kunit_bus_device))
> + return PTR_ERR(kunit_bus_device);
>
> error = bus_register(&kunit_bus_type);
> if (error)
> --
> 2.43.0
>

> --
> You received this message because you are subscribed to the Google Groups "KUnit Development" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to kunit-dev+...@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/kunit-dev/dd938a86-38d9-4d62-abd0-1df80395fbbd%40moroto.mountain.

[David Gow]

On Thu, 11 Jan 2024 at 02:55, Dan Carpenter <dan.ca...@linaro.org> wrote:
>
> The root_device_register() function does not return NULL, it returns
> error pointers. Fix the check to match.
>
> Fixes: d03c720e03bd ("kunit: Add APIs for managing devices")
> Signed-off-by: Dan Carpenter <dan.ca...@linaro.org>
> ---

Thanks for catching this.

Reviewed-by: David Gow <davi...@google.com>

Cheers,
-- David