media: i2c: imx219: Name all subdev state variables 'state'

Subdev state variables are named with a mix of 'state' and 'sd_state'
through the driver. To improve consistency, name them all 'state'.

Signed-off-by: Laurent Pinchart <laurent.pinchart@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 2b88c5b8a7bf3751832c4c65b25a39fc8c09530b..358a6d77d88cfaaf99e645e7d0af30b9be197166 100644 (file)
--- a/drivers/media/i2c/imx219.c
+++ b/drivers/media/i2c/imx219.c
@@ -774,7 +774,7 @@ static void imx219_update_pad_format(struct imx219 *imx219,
 }
 
 static int imx219_enum_mbus_code(struct v4l2_subdev *sd,
-                                struct v4l2_subdev_state *sd_state,
+                                struct v4l2_subdev_state *state,
                                 struct v4l2_subdev_mbus_code_enum *code)
 {
        struct imx219 *imx219 = to_imx219(sd);
@@ -788,7 +788,7 @@ static int imx219_enum_mbus_code(struct v4l2_subdev *sd,
 }
 
 static int imx219_enum_frame_size(struct v4l2_subdev *sd,
-                                 struct v4l2_subdev_state *sd_state,
+                                 struct v4l2_subdev_state *state,
                                  struct v4l2_subdev_frame_size_enum *fse)
 {
        struct imx219 *imx219 = to_imx219(sd);
@@ -810,7 +810,7 @@ static int imx219_enum_frame_size(struct v4l2_subdev *sd,
 }
 
 static int imx219_set_pad_format(struct v4l2_subdev *sd,
-                                struct v4l2_subdev_state *sd_state,
+                                struct v4l2_subdev_state *state,
                                 struct v4l2_subdev_format *fmt)
 {
        struct imx219 *imx219 = to_imx219(sd);
@@ -827,7 +827,7 @@ static int imx219_set_pad_format(struct v4l2_subdev *sd,
 
        imx219_update_pad_format(imx219, mode, &fmt->format, fmt->format.code);
 
-       format = v4l2_subdev_get_pad_format(sd, sd_state, 0);
+       format = v4l2_subdev_get_pad_format(sd, state, 0);
        *format = fmt->format;
 
        /*
@@ -837,7 +837,7 @@ static int imx219_set_pad_format(struct v4l2_subdev *sd,
        bin_h = min(IMX219_PIXEL_ARRAY_WIDTH / format->width, 2U);
        bin_v = min(IMX219_PIXEL_ARRAY_HEIGHT / format->height, 2U);
 
-       crop = v4l2_subdev_get_pad_crop(sd, sd_state, 0);
+       crop = v4l2_subdev_get_pad_crop(sd, state, 0);
        crop->width = format->width * bin_h;
        crop->height = format->height * bin_v;
        crop->left = (IMX219_NATIVE_WIDTH - crop->width) / 2;
@@ -872,12 +872,12 @@ static int imx219_set_pad_format(struct v4l2_subdev *sd,
 }
 
 static int imx219_get_selection(struct v4l2_subdev *sd,
-                               struct v4l2_subdev_state *sd_state,
+                               struct v4l2_subdev_state *state,
                                struct v4l2_subdev_selection *sel)
 {
        switch (sel->target) {
        case V4L2_SEL_TGT_CROP: {
-               sel->r = *v4l2_subdev_get_pad_crop(sd, sd_state, 0);
+               sel->r = *v4l2_subdev_get_pad_crop(sd, state, 0);
                return 0;
        }