| Message ID | 20230922080421.35145-3-wsa+renesas@sang-engineering.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | b622e46690eb34a738bb295308f83c253b78afe0 |
| Delegated to: | Kieran Bingham |
| Headers | show |
| Series | treewide: drop check because i2c_unregister_device() is NULL safe | expand |
On Fri, Sep 22, 2023 at 4:45 PM Wolfram Sang <wsa+renesas@sang-engineering.com> wrote: > No need to check the argument of i2c_unregister_device() because the > function itself does it. > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Gr{oetje,eeting}s, Geert
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 <wsa+renesas@sang-engineering.com> Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> 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"); >
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");
No need to check the argument of i2c_unregister_device() because the function itself does it. Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> --- Build tested only. Please apply to your tree. drivers/media/i2c/rdacm20.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)