2023-09-22 08:37:00

by Wolfram Sang

Subject: [PATCH 2/3] media: i2c: drop check because i2c_unregister_device() is NULL safe

No need to check the argument of i2c_unregister_device() because the
function itself does it.

Signed-off-by: Wolfram Sang <[email protected]>
---
Build tested only. Please apply to your tree.

drivers/media/i2c/rdacm20.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/media/i2c/rdacm20.c b/drivers/media/i2c/rdacm20.c
index f4e2e2f3972a..b4647bda8c21 100644
--- a/drivers/media/i2c/rdacm20.c
+++ b/drivers/media/i2c/rdacm20.c
@@ -625,8 +625,7 @@ static int rdacm20_probe(struct i2c_client *client)
v4l2_ctrl_handler_free(&dev->ctrls);
error:
media_entity_cleanup(&dev->sd.entity);
- if (dev->sensor)
- i2c_unregister_device(dev->sensor);
+ i2c_unregister_device(dev->sensor);

dev_err(&client->dev, "probe failed\n");

--
2.30.2

2023-09-22 13:45:00

by Kieran Bingham

Subject: Re: [PATCH 2/3] media: i2c: drop check because i2c_unregister_device() is NULL safe

Hi Wolfram,

Quoting Wolfram Sang (2023-09-22 09:04:19)
> No need to check the argument of i2c_unregister_device() because the
> function itself does it.

Well spotted!

Reviewed-by: Kieran Bingham <[email protected]>

>
> Signed-off-by: Wolfram Sang <[email protected]>
> ---
> Build tested only. Please apply to your tree.
>
> drivers/media/i2c/rdacm20.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/media/i2c/rdacm20.c b/drivers/media/i2c/rdacm20.c
> index f4e2e2f3972a..b4647bda8c21 100644
> --- a/drivers/media/i2c/rdacm20.c
> +++ b/drivers/media/i2c/rdacm20.c
> @@ -625,8 +625,7 @@ static int rdacm20_probe(struct i2c_client *client)
> v4l2_ctrl_handler_free(&dev->ctrls);
> error:
> media_entity_cleanup(&dev->sd.entity);
> - if (dev->sensor)
> - i2c_unregister_device(dev->sensor);
> + i2c_unregister_device(dev->sensor);
>
> dev_err(&client->dev, "probe failed\n");
>
> --
> 2.30.2
>

2023-09-25 11:53:51

by Geert Uytterhoeven

Subject: Re: [PATCH 2/3] media: i2c: drop check because i2c_unregister_device() is NULL safe

On Fri, Sep 22, 2023 at 4:45 PM Wolfram Sang
<[email protected]> wrote:
> No need to check the argument of i2c_unregister_device() because the
> function itself does it.
>
> Signed-off-by: Wolfram Sang <[email protected]>

Reviewed-by: Geert Uytterhoeven <[email protected]>

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

2023-09-25 14:37:47

by Laurent Pinchart

Subject: Re: [PATCH 2/3] media: i2c: drop check because i2c_unregister_device() is NULL safe

On Fri, Sep 22, 2023 at 10:04:19AM +0200, Wolfram Sang wrote:
> No need to check the argument of i2c_unregister_device() because the
> function itself does it.
>
> Signed-off-by: Wolfram Sang <[email protected]>

Reviewed-by: Laurent Pinchart <[email protected]>

I'll take this in my tree and send a pull request if Sakari doesn't pick
up the patch himself.

> ---
> Build tested only. Please apply to your tree.
>
> drivers/media/i2c/rdacm20.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/media/i2c/rdacm20.c b/drivers/media/i2c/rdacm20.c
> index f4e2e2f3972a..b4647bda8c21 100644
> --- a/drivers/media/i2c/rdacm20.c
> +++ b/drivers/media/i2c/rdacm20.c
> @@ -625,8 +625,7 @@ static int rdacm20_probe(struct i2c_client *client)
> v4l2_ctrl_handler_free(&dev->ctrls);
> error:
> media_entity_cleanup(&dev->sd.entity);
> - if (dev->sensor)
> - i2c_unregister_device(dev->sensor);
> + i2c_unregister_device(dev->sensor);
>
> dev_err(&client->dev, "probe failed\n");
>

--
Regards,

Laurent Pinchart