Message ID | 20221016061523.30127-19-laurent.pinchart@ideasonboard.com |
---|---|
State | Accepted |
Commit | b25537efeea981b9a3c99c4666e8d240833993f6 |
Headers | show |
Series | media: i2c: imx290: Miscellaneous improvements | expand |
Hello Laurent, thanks for the updated patch. Am Sonntag, 16. Oktober 2022, 08:15:21 CEST schrieb Laurent Pinchart: > The driver duplicates the same pattern to access the try or active > format in multiple locations. Factor it out to a separate function. > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > Changes since v1: > > - Avoid returning NULL from imx290_get_pad_format() > --- > drivers/media/i2c/imx290.c | 24 ++++++++++++++---------- > 1 file changed, 14 insertions(+), 10 deletions(-) > > diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c > index 0b34d60f8ce2..b0ff0e8ed45a 100644 > --- a/drivers/media/i2c/imx290.c > +++ b/drivers/media/i2c/imx290.c > @@ -519,6 +519,16 @@ static const struct v4l2_ctrl_ops imx290_ctrl_ops = { > .s_ctrl = imx290_set_ctrl, > }; > > +static struct v4l2_mbus_framefmt * > +imx290_get_pad_format(struct imx290 *imx290, struct v4l2_subdev_state > *state, + u32 which) > +{ > + if (which == V4L2_SUBDEV_FORMAT_ACTIVE) > + return &imx290->current_format; > + else > + return v4l2_subdev_get_try_format(&imx290->sd, state, 0); > +} > + v4l2_subdev_get_try_format can return NULL, which would be dereferenced later on. But this happens only if state is NULL itself, which will raise a WARN_ON anyway. So i guess this is fine. Acked-by: Alexander Stein <alexander.stein@ew.tq-group.com> > static int imx290_enum_mbus_code(struct v4l2_subdev *sd, > struct v4l2_subdev_state *sd_state, > struct v4l2_subdev_mbus_code_enum *code) > @@ -562,12 +572,7 @@ static int imx290_get_fmt(struct v4l2_subdev *sd, > > mutex_lock(&imx290->lock); > > - if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) > - framefmt = v4l2_subdev_get_try_format(&imx290->sd, sd_state, > - fmt- >pad); > - else > - framefmt = &imx290->current_format; > - > + framefmt = imx290_get_pad_format(imx290, sd_state, fmt->which); > fmt->format = *framefmt; > > mutex_unlock(&imx290->lock); > @@ -627,10 +632,9 @@ static int imx290_set_fmt(struct v4l2_subdev *sd, > fmt->format.code = imx290_formats[i].code; > fmt->format.field = V4L2_FIELD_NONE; > > - if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) { > - format = v4l2_subdev_get_try_format(sd, sd_state, fmt- >pad); > - } else { > - format = &imx290->current_format; > + format = imx290_get_pad_format(imx290, sd_state, fmt->which); > + > + if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE) { > imx290->current_mode = mode; > imx290->bpp = imx290_formats[i].bpp;
Hi Alexander, On Mon, Oct 17, 2022 at 07:55:28AM +0200, Alexander Stein wrote: > Am Sonntag, 16. Oktober 2022, 08:15:21 CEST schrieb Laurent Pinchart: > > The driver duplicates the same pattern to access the try or active > > format in multiple locations. Factor it out to a separate function. > > > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > --- > > Changes since v1: > > > > - Avoid returning NULL from imx290_get_pad_format() > > --- > > drivers/media/i2c/imx290.c | 24 ++++++++++++++---------- > > 1 file changed, 14 insertions(+), 10 deletions(-) > > > > diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c > > index 0b34d60f8ce2..b0ff0e8ed45a 100644 > > --- a/drivers/media/i2c/imx290.c > > +++ b/drivers/media/i2c/imx290.c > > @@ -519,6 +519,16 @@ static const struct v4l2_ctrl_ops imx290_ctrl_ops = { > > .s_ctrl = imx290_set_ctrl, > > }; > > > > +static struct v4l2_mbus_framefmt * > > +imx290_get_pad_format(struct imx290 *imx290, struct v4l2_subdev_state *state, > > + u32 which) > > +{ > > + if (which == V4L2_SUBDEV_FORMAT_ACTIVE) > > + return &imx290->current_format; > > + else > > + return v4l2_subdev_get_try_format(&imx290->sd, state, 0); > > +} > > + > > v4l2_subdev_get_try_format can return NULL, which would be dereferenced later > on. But this happens only if state is NULL itself, which will raise a WARN_ON > anyway. So i guess this is fine. I'll add a patch on top of the series to convert the driver to the V4L2 active state, that should simplify all this. > Acked-by: Alexander Stein <alexander.stein@ew.tq-group.com> > > > static int imx290_enum_mbus_code(struct v4l2_subdev *sd, > > struct v4l2_subdev_state *sd_state, > > struct v4l2_subdev_mbus_code_enum *code) > > @@ -562,12 +572,7 @@ static int imx290_get_fmt(struct v4l2_subdev *sd, > > > > mutex_lock(&imx290->lock); > > > > - if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) > > - framefmt = v4l2_subdev_get_try_format(&imx290->sd, sd_state, > > - fmt->pad); > > - else > > - framefmt = &imx290->current_format; > > - > > + framefmt = imx290_get_pad_format(imx290, sd_state, fmt->which); > > fmt->format = *framefmt; > > > > mutex_unlock(&imx290->lock); > > @@ -627,10 +632,9 @@ static int imx290_set_fmt(struct v4l2_subdev *sd, > > fmt->format.code = imx290_formats[i].code; > > fmt->format.field = V4L2_FIELD_NONE; > > > > - if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) { > > - format = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad); > > - } else { > > - format = &imx290->current_format; > > + format = imx290_get_pad_format(imx290, sd_state, fmt->which); > > + > > + if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE) { > > imx290->current_mode = mode; > > imx290->bpp = imx290_formats[i].bpp;
diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c index 0b34d60f8ce2..b0ff0e8ed45a 100644 --- a/drivers/media/i2c/imx290.c +++ b/drivers/media/i2c/imx290.c @@ -519,6 +519,16 @@ static const struct v4l2_ctrl_ops imx290_ctrl_ops = { .s_ctrl = imx290_set_ctrl, }; +static struct v4l2_mbus_framefmt * +imx290_get_pad_format(struct imx290 *imx290, struct v4l2_subdev_state *state, + u32 which) +{ + if (which == V4L2_SUBDEV_FORMAT_ACTIVE) + return &imx290->current_format; + else + return v4l2_subdev_get_try_format(&imx290->sd, state, 0); +} + static int imx290_enum_mbus_code(struct v4l2_subdev *sd, struct v4l2_subdev_state *sd_state, struct v4l2_subdev_mbus_code_enum *code) @@ -562,12 +572,7 @@ static int imx290_get_fmt(struct v4l2_subdev *sd, mutex_lock(&imx290->lock); - if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) - framefmt = v4l2_subdev_get_try_format(&imx290->sd, sd_state, - fmt->pad); - else - framefmt = &imx290->current_format; - + framefmt = imx290_get_pad_format(imx290, sd_state, fmt->which); fmt->format = *framefmt; mutex_unlock(&imx290->lock); @@ -627,10 +632,9 @@ static int imx290_set_fmt(struct v4l2_subdev *sd, fmt->format.code = imx290_formats[i].code; fmt->format.field = V4L2_FIELD_NONE; - if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) { - format = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad); - } else { - format = &imx290->current_format; + format = imx290_get_pad_format(imx290, sd_state, fmt->which); + + if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE) { imx290->current_mode = mode; imx290->bpp = imx290_formats[i].bpp;
The driver duplicates the same pattern to access the try or active format in multiple locations. Factor it out to a separate function. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- Changes since v1: - Avoid returning NULL from imx290_get_pad_format() --- drivers/media/i2c/imx290.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-)