| Message ID | 20220203175009.558868-11-jeanmichel.hautbois@ideasonboard.com |
|---|---|
| State | New |
| Headers | show |
| Series | Add support for BCM2835 camera interface (unicam) | expand |
Hi Jean-Michel, Thank you for the patch. On Thu, Feb 03, 2022 at 06:50:07PM +0100, Jean-Michel Hautbois wrote: > There is no need to dereference the imx219 structure. Use a local > v4l2_subdev instead. > > Signed-off-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/media/i2c/imx219.c | 18 ++++++++++-------- > 1 file changed, 10 insertions(+), 8 deletions(-) > > diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c > index 7d29cf2b06f8..7c224d007f3e 100644 > --- a/drivers/media/i2c/imx219.c > +++ b/drivers/media/i2c/imx219.c > @@ -1492,6 +1492,7 @@ static int imx219_check_hwcfg(struct device *dev) > static int imx219_probe(struct i2c_client *client) > { > struct device *dev = &client->dev; > + struct v4l2_subdev *sd; > struct imx219 *imx219; > int ret; > > @@ -1499,7 +1500,8 @@ static int imx219_probe(struct i2c_client *client) > if (!imx219) > return -ENOMEM; > > - v4l2_i2c_subdev_init(&imx219->sd, client, &imx219_subdev_ops); > + sd = &imx219->sd; > + v4l2_i2c_subdev_init(sd, client, &imx219_subdev_ops); > > /* Check the hardware configuration in device tree */ > if (imx219_check_hwcfg(dev)) > @@ -1566,21 +1568,21 @@ static int imx219_probe(struct i2c_client *client) > goto error_power_off; > > /* Initialize subdev */ > - imx219->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE | > - V4L2_SUBDEV_FL_HAS_EVENTS | > - V4L2_SUBDEV_FL_MULTIPLEXED; > - imx219->sd.entity.function = MEDIA_ENT_F_CAM_SENSOR; > + sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE | > + V4L2_SUBDEV_FL_HAS_EVENTS | > + V4L2_SUBDEV_FL_MULTIPLEXED; > + sd->entity.function = MEDIA_ENT_F_CAM_SENSOR; > > /* Initialize source pad */ > imx219->pad.flags = MEDIA_PAD_FL_SOURCE; > > - ret = media_entity_pads_init(&imx219->sd.entity, 1, &imx219->pad); > + ret = media_entity_pads_init(&sd->entity, 1, &imx219->pad); > if (ret) { > dev_err(dev, "failed to init entity pads: %d\n", ret); > goto error_handler_free; > } > > - ret = v4l2_async_register_subdev_sensor(&imx219->sd); > + ret = v4l2_async_register_subdev_sensor(sd); > if (ret < 0) { > dev_err(dev, "failed to register sensor sub-device: %d\n", ret); > goto error_media_entity; > @@ -1594,7 +1596,7 @@ static int imx219_probe(struct i2c_client *client) > return 0; > > error_media_entity: > - media_entity_cleanup(&imx219->sd.entity); > + media_entity_cleanup(&sd->entity); > > error_handler_free: > imx219_free_controls(imx219);
diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c index 7d29cf2b06f8..7c224d007f3e 100644 --- a/drivers/media/i2c/imx219.c +++ b/drivers/media/i2c/imx219.c @@ -1492,6 +1492,7 @@ static int imx219_check_hwcfg(struct device *dev) static int imx219_probe(struct i2c_client *client) { struct device *dev = &client->dev; + struct v4l2_subdev *sd; struct imx219 *imx219; int ret; @@ -1499,7 +1500,8 @@ static int imx219_probe(struct i2c_client *client) if (!imx219) return -ENOMEM; - v4l2_i2c_subdev_init(&imx219->sd, client, &imx219_subdev_ops); + sd = &imx219->sd; + v4l2_i2c_subdev_init(sd, client, &imx219_subdev_ops); /* Check the hardware configuration in device tree */ if (imx219_check_hwcfg(dev)) @@ -1566,21 +1568,21 @@ static int imx219_probe(struct i2c_client *client) goto error_power_off; /* Initialize subdev */ - imx219->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE | - V4L2_SUBDEV_FL_HAS_EVENTS | - V4L2_SUBDEV_FL_MULTIPLEXED; - imx219->sd.entity.function = MEDIA_ENT_F_CAM_SENSOR; + sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE | + V4L2_SUBDEV_FL_HAS_EVENTS | + V4L2_SUBDEV_FL_MULTIPLEXED; + sd->entity.function = MEDIA_ENT_F_CAM_SENSOR; /* Initialize source pad */ imx219->pad.flags = MEDIA_PAD_FL_SOURCE; - ret = media_entity_pads_init(&imx219->sd.entity, 1, &imx219->pad); + ret = media_entity_pads_init(&sd->entity, 1, &imx219->pad); if (ret) { dev_err(dev, "failed to init entity pads: %d\n", ret); goto error_handler_free; } - ret = v4l2_async_register_subdev_sensor(&imx219->sd); + ret = v4l2_async_register_subdev_sensor(sd); if (ret < 0) { dev_err(dev, "failed to register sensor sub-device: %d\n", ret); goto error_media_entity; @@ -1594,7 +1596,7 @@ static int imx219_probe(struct i2c_client *client) return 0; error_media_entity: - media_entity_cleanup(&imx219->sd.entity); + media_entity_cleanup(&sd->entity); error_handler_free: imx219_free_controls(imx219);
There is no need to dereference the imx219 structure. Use a local v4l2_subdev instead. Signed-off-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com> --- drivers/media/i2c/imx219.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)