media: i2c: imx219: Don't store the current mode in the imx219 structure

The mode field of the imx219 structure is only used in
imx219_init_controls(), after the probe function sets it to point to the
default mode. Use the default mode directly when initializing controls,
and drop the mode field from the imx219 structure.

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@xs4all.nl>

diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c
index f4f684bda4fab688a48aaad47298e7951f197d09..82e5d1dad14a75af0c2b009e6b4c4dec9c9fc441 100644 (file)
--- a/drivers/media/i2c/imx219.c
+++ b/drivers/media/i2c/imx219.c
@@ -362,9 +362,6 @@ struct imx219 {
        struct v4l2_ctrl *vblank;
        struct v4l2_ctrl *hblank;
 
-       /* Current mode */
-       const struct imx219_mode *mode;
-
        /* Two or Four lanes */
        u8 lanes;
 };
@@ -580,7 +577,6 @@ static int imx219_set_pad_format(struct v4l2_subdev *sd,
        *crop = mode->crop;
 
        if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE) {
-               imx219->mode = mode;
                /* Update limits and set FPS to default */
                __v4l2_ctrl_modify_range(imx219->vblank, IMX219_VBLANK_MIN,
                                         IMX219_VTS_MAX - mode->height, 1,
@@ -923,8 +919,8 @@ static unsigned long imx219_get_pixel_rate(struct imx219 *imx219)
 static int imx219_init_controls(struct imx219 *imx219)
 {
        struct i2c_client *client = v4l2_get_subdevdata(&imx219->sd);
+       const struct imx219_mode *mode = &supported_modes[0];
        struct v4l2_ctrl_handler *ctrl_hdlr;
-       unsigned int height = imx219->mode->height;
        struct v4l2_fwnode_device_properties props;
        int exposure_max, exposure_def, hblank;
        int i, ret;
@@ -953,15 +949,15 @@ static int imx219_init_controls(struct imx219 *imx219)
        /* Initial vblank/hblank/exposure parameters based on current mode */
        imx219->vblank = v4l2_ctrl_new_std(ctrl_hdlr, &imx219_ctrl_ops,
                                           V4L2_CID_VBLANK, IMX219_VBLANK_MIN,
-                                          IMX219_VTS_MAX - height, 1,
-                                          imx219->mode->vts_def - height);
-       hblank = IMX219_PPL_DEFAULT - imx219->mode->width;
+                                          IMX219_VTS_MAX - mode->height, 1,
+                                          mode->vts_def - mode->height);
+       hblank = IMX219_PPL_DEFAULT - mode->width;
        imx219->hblank = v4l2_ctrl_new_std(ctrl_hdlr, &imx219_ctrl_ops,
                                           V4L2_CID_HBLANK, hblank, hblank,
                                           1, hblank);
        if (imx219->hblank)
                imx219->hblank->flags |= V4L2_CTRL_FLAG_READ_ONLY;
-       exposure_max = imx219->mode->vts_def - 4;
+       exposure_max = mode->vts_def - 4;
        exposure_def = (exposure_max < IMX219_EXPOSURE_DEFAULT) ?
                exposure_max : IMX219_EXPOSURE_DEFAULT;
        imx219->exposure = v4l2_ctrl_new_std(ctrl_hdlr, &imx219_ctrl_ops,
@@ -1148,10 +1144,8 @@ static int imx219_probe(struct i2c_client *client)
        if (ret)
                goto error_power_off;
 
-       /* Set default mode to max resolution */
-       imx219->mode = &supported_modes[0];
-
-       /* sensor doesn't enter LP-11 state upon power up until and unless
+       /*
+        * Sensor doesn't enter LP-11 state upon power up until and unless
         * streaming is started, so upon power up switch the modes to:
         * streaming -> standby
         */