Commit b25537ef authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Sakari Ailus

media: i2c: imx290: Factor out format retrieval to separate function

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: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
parent 0b274ef2
...@@ -519,6 +519,16 @@ static const struct v4l2_ctrl_ops imx290_ctrl_ops = { ...@@ -519,6 +519,16 @@ static const struct v4l2_ctrl_ops imx290_ctrl_ops = {
.s_ctrl = imx290_set_ctrl, .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, static int imx290_enum_mbus_code(struct v4l2_subdev *sd,
struct v4l2_subdev_state *sd_state, struct v4l2_subdev_state *sd_state,
struct v4l2_subdev_mbus_code_enum *code) struct v4l2_subdev_mbus_code_enum *code)
...@@ -562,12 +572,7 @@ static int imx290_get_fmt(struct v4l2_subdev *sd, ...@@ -562,12 +572,7 @@ static int imx290_get_fmt(struct v4l2_subdev *sd,
mutex_lock(&imx290->lock); mutex_lock(&imx290->lock);
if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) framefmt = imx290_get_pad_format(imx290, sd_state, fmt->which);
framefmt = v4l2_subdev_get_try_format(&imx290->sd, sd_state,
fmt->pad);
else
framefmt = &imx290->current_format;
fmt->format = *framefmt; fmt->format = *framefmt;
mutex_unlock(&imx290->lock); mutex_unlock(&imx290->lock);
...@@ -627,10 +632,9 @@ static int imx290_set_fmt(struct v4l2_subdev *sd, ...@@ -627,10 +632,9 @@ static int imx290_set_fmt(struct v4l2_subdev *sd,
fmt->format.code = imx290_formats[i].code; fmt->format.code = imx290_formats[i].code;
fmt->format.field = V4L2_FIELD_NONE; fmt->format.field = V4L2_FIELD_NONE;
if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) { format = imx290_get_pad_format(imx290, sd_state, fmt->which);
format = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
} else { if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE) {
format = &imx290->current_format;
imx290->current_mode = mode; imx290->current_mode = mode;
imx290->bpp = imx290_formats[i].bpp; imx290->bpp = imx290_formats[i].bpp;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment