media: i2c: imx219: Inline imx219_update_pad_format() in its caller

The imx219_update_pad_format() is short and called from a single place,
in imx219_set_pad_format(). Inline the code in the caller to keep all
format adjustments grouped in a single place and improve readability.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>

diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c
index bc55fe2a93b44e66e8e02205b104d58f93488857..fee63bc106d9e6e91f9c7ec768493e41cf4f6fb3 100644 (file)
--- a/drivers/media/i2c/imx219.c
+++ b/drivers/media/i2c/imx219.c
@@ -792,21 +792,6 @@ static int imx219_disable_streams(struct v4l2_subdev *sd,
        return ret;
 }
 
-static void imx219_update_pad_format(struct imx219 *imx219,
-                                    const struct imx219_mode *mode,
-                                    struct v4l2_mbus_framefmt *fmt, u32 code)
-{
-       /* Bayer order varies with flips */
-       fmt->code = imx219_get_format_code(imx219, code);
-       fmt->width = mode->width;
-       fmt->height = mode->height;
-       fmt->field = V4L2_FIELD_NONE;
-       fmt->colorspace = V4L2_COLORSPACE_RAW;
-       fmt->ycbcr_enc = V4L2_YCBCR_ENC_601;
-       fmt->quantization = V4L2_QUANTIZATION_FULL_RANGE;
-       fmt->xfer_func = V4L2_XFER_FUNC_NONE;
-}
-
 static int imx219_enum_mbus_code(struct v4l2_subdev *sd,
                                 struct v4l2_subdev_state *state,
                                 struct v4l2_subdev_mbus_code_enum *code)
@@ -858,12 +843,24 @@ static int imx219_set_pad_format(struct v4l2_subdev *sd,
        format = v4l2_subdev_state_get_format(state, 0);
        prev_line_len = format->width + imx219->hblank->val;
 
+       /*
+        * Adjust the requested format to match the closest mode. The Bayer
+        * order varies with flips.
+        */
        mode = v4l2_find_nearest_size(supported_modes,
                                      ARRAY_SIZE(supported_modes),
                                      width, height,
                                      fmt->format.width, fmt->format.height);
 
-       imx219_update_pad_format(imx219, mode, &fmt->format, fmt->format.code);
+       fmt->format.code = imx219_get_format_code(imx219, fmt->format.code);
+       fmt->format.width = mode->width;
+       fmt->format.height = mode->height;
+       fmt->format.field = V4L2_FIELD_NONE;
+       fmt->format.colorspace = V4L2_COLORSPACE_RAW;
+       fmt->format.ycbcr_enc = V4L2_YCBCR_ENC_601;
+       fmt->format.quantization = V4L2_QUANTIZATION_FULL_RANGE;
+       fmt->format.xfer_func = V4L2_XFER_FUNC_NONE;
+
        *format = fmt->format;
 
        /*