media: i2c: Use accessors for pad config 'try_*' fields

Kate Hsuan · Kate Hsuan · commit c38f332cd1ca · 2025-05-06T13:58:58.000+08:00
JIRA: https://issues.redhat.com/browse/RHEL-86821 Conflicts: Due to unspported drivers drivers/media/i2c/ov2680.c drivers/media/i2c/ov6650.c commit fd17e3a Author: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Date: Mon Oct 23 23:40:10 2023 +0200 The 'try_*' fields of the v4l2_subdev_pad_config structure are meant to be accessed through helper functions. Replace direct access with usage of the v4l2_subdev_get_pad_format(), v4l2_subdev_get_pad_crop() and v4l2_subdev_get_pad_compose() helpers. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org> Signed-off-by: Kate Hsuan <hpa@redhat.com>
diff --git a/drivers/media/i2c/adv7183.c b/drivers/media/i2c/adv7183.c
@@ -443,7 +443,7 @@ static int adv7183_set_fmt(struct v4l2_subdev *sd,
 	if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE)
 		decoder->fmt = *fmt;
 	else
-		sd_state->pads->try_fmt = *fmt;
+		*v4l2_subdev_get_pad_format(sd, sd_state, 0) = *fmt;
 	return 0;
 }
 
diff --git a/drivers/media/i2c/imx274.c b/drivers/media/i2c/imx274.c
@@ -1019,8 +1019,8 @@ static int __imx274_change_compose(struct stimx274 *imx274,
 	int best_goodness = INT_MIN;
 
 	if (which == V4L2_SUBDEV_FORMAT_TRY) {
-		cur_crop = &sd_state->pads->try_crop;
-		tgt_fmt = &sd_state->pads->try_fmt;
+		cur_crop = v4l2_subdev_get_pad_crop(&imx274->sd, sd_state, 0);
+		tgt_fmt = v4l2_subdev_get_pad_format(&imx274->sd, sd_state, 0);
 	} else {
 		cur_crop = &imx274->crop;
 		tgt_fmt = &imx274->format;
@@ -1113,7 +1113,7 @@ static int imx274_set_fmt(struct v4l2_subdev *sd,
 	 */
 	fmt->field = V4L2_FIELD_NONE;
 	if (format->which == V4L2_SUBDEV_FORMAT_TRY)
-		sd_state->pads->try_fmt = *fmt;
+		*v4l2_subdev_get_pad_format(sd, sd_state, 0) = *fmt;
 	else
 		imx274->format = *fmt;
 
@@ -1144,8 +1144,8 @@ static int imx274_get_selection(struct v4l2_subdev *sd,
 	}
 
 	if (sel->which == V4L2_SUBDEV_FORMAT_TRY) {
-		src_crop = &sd_state->pads->try_crop;
-		src_fmt = &sd_state->pads->try_fmt;
+		src_crop = v4l2_subdev_get_pad_crop(sd, sd_state, 0);
+		src_fmt = v4l2_subdev_get_pad_format(sd, sd_state, 0);
 	} else {
 		src_crop = &imx274->crop;
 		src_fmt = &imx274->format;
@@ -1216,7 +1216,7 @@ static int imx274_set_selection_crop(struct stimx274 *imx274,
 	sel->r = new_crop;
 
 	if (sel->which == V4L2_SUBDEV_FORMAT_TRY)
-		tgt_crop = &sd_state->pads->try_crop;
+		tgt_crop = v4l2_subdev_get_pad_crop(&imx274->sd, sd_state, 0);
 	else
 		tgt_crop = &imx274->crop;
 
diff --git a/drivers/media/i2c/mt9m001.c b/drivers/media/i2c/mt9m001.c
@@ -411,7 +411,7 @@ static int mt9m001_set_fmt(struct v4l2_subdev *sd,
 
 	if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE)
 		return mt9m001_s_fmt(sd, fmt, mf);
-	sd_state->pads->try_fmt = *mf;
+	*v4l2_subdev_get_pad_format(sd, sd_state, 0) = *mf;
 	return 0;
 }
 
diff --git a/drivers/media/i2c/mt9m111.c b/drivers/media/i2c/mt9m111.c
@@ -678,7 +678,7 @@ static int mt9m111_set_fmt(struct v4l2_subdev *sd,
 	mf->xfer_func	= V4L2_XFER_FUNC_DEFAULT;
 
 	if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
-		sd_state->pads->try_fmt = *mf;
+		*v4l2_subdev_get_pad_format(sd, sd_state, 0) = *mf;
 		return 0;
 	}
 
diff --git a/drivers/media/i2c/mt9t112.c b/drivers/media/i2c/mt9t112.c
@@ -982,7 +982,7 @@ static int mt9t112_set_fmt(struct v4l2_subdev *sd,
 
 	if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE)
 		return mt9t112_s_fmt(sd, mf);
-	sd_state->pads->try_fmt = *mf;
+	*v4l2_subdev_get_pad_format(sd, sd_state, 0) = *mf;
 
 	return 0;
 }
diff --git a/drivers/media/i2c/mt9v011.c b/drivers/media/i2c/mt9v011.c
@@ -358,7 +358,7 @@ static int mt9v011_set_fmt(struct v4l2_subdev *sd,
 
 		set_res(sd);
 	} else {
-		sd_state->pads->try_fmt = *fmt;
+		*v4l2_subdev_get_pad_format(sd, sd_state, 0) = *fmt;
 	}
 
 	return 0;
diff --git a/drivers/media/i2c/mt9v111.c b/drivers/media/i2c/mt9v111.c
@@ -957,7 +957,7 @@ static int mt9v111_set_format(struct v4l2_subdev *subdev,
 static int mt9v111_init_state(struct v4l2_subdev *subdev,
 			      struct v4l2_subdev_state *sd_state)
 {
-	sd_state->pads->try_fmt = mt9v111_def_fmt;
+	*v4l2_subdev_get_pad_format(subdev, sd_state, 0) = mt9v111_def_fmt;
 
 	return 0;
 }
diff --git a/drivers/media/i2c/ov2640.c b/drivers/media/i2c/ov2640.c
@@ -996,7 +996,7 @@ static int ov2640_set_fmt(struct v4l2_subdev *sd,
 		/* select format */
 		priv->cfmt_code = mf->code;
 	} else {
-		sd_state->pads->try_fmt = *mf;
+		*v4l2_subdev_get_pad_format(sd, sd_state, 0) = *mf;
 	}
 out:
 	mutex_unlock(&priv->lock);
diff --git a/drivers/media/i2c/ov772x.c b/drivers/media/i2c/ov772x.c
@@ -1222,7 +1222,7 @@ static int ov772x_set_fmt(struct v4l2_subdev *sd,
 	mf->xfer_func = V4L2_XFER_FUNC_DEFAULT;
 
 	if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
-		sd_state->pads->try_fmt = *mf;
+		*v4l2_subdev_get_pad_format(sd, sd_state, 0) = *mf;
 		return 0;
 	}
 
diff --git a/drivers/media/i2c/ov9640.c b/drivers/media/i2c/ov9640.c
@@ -547,7 +547,7 @@ static int ov9640_set_fmt(struct v4l2_subdev *sd,
 	if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE)
 		return ov9640_s_fmt(sd, mf);
 
-	sd_state->pads->try_fmt = *mf;
+	*v4l2_subdev_get_pad_format(sd, sd_state, 0) = *mf;
 
 	return 0;
 }
diff --git a/drivers/media/i2c/rj54n1cb0c.c b/drivers/media/i2c/rj54n1cb0c.c
@@ -1009,7 +1009,7 @@ static int rj54n1_set_fmt(struct v4l2_subdev *sd,
 			      &mf->height, 84, RJ54N1_MAX_HEIGHT, align, 0);
 
 	if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
-		sd_state->pads->try_fmt = *mf;
+		*v4l2_subdev_get_pad_format(sd, sd_state, 0) = *mf;
 		return 0;
 	}
 
diff --git a/drivers/media/i2c/saa6752hs.c b/drivers/media/i2c/saa6752hs.c
@@ -595,7 +595,7 @@ static int saa6752hs_set_fmt(struct v4l2_subdev *sd,
 	f->colorspace = V4L2_COLORSPACE_SMPTE170M;
 
 	if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
-		sd_state->pads->try_fmt = *f;
+		*v4l2_subdev_get_pad_format(sd, sd_state, 0) = *f;
 		return 0;
 	}
 
diff --git a/drivers/media/i2c/tw9910.c b/drivers/media/i2c/tw9910.c
@@ -829,7 +829,7 @@ static int tw9910_set_fmt(struct v4l2_subdev *sd,
 	if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE)
 		return tw9910_s_fmt(sd, mf);
 
-	sd_state->pads->try_fmt = *mf;
+	*v4l2_subdev_get_pad_format(sd, sd_state, 0) = *mf;
 
 	return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -443,7 +443,7 @@ static int adv7183_set_fmt(struct v4l2_subdev *sd,`
`443`	`443`	`if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE)`
`444`	`444`	`decoder->fmt = *fmt;`
`445`	`445`	`else`
`446`		`- sd_state->pads->try_fmt = *fmt;`
	`446`	`+ v4l2_subdev_get_pad_format(sd, sd_state, 0) = fmt;`
`447`	`447`	`return 0;`
`448`	`448`	`}`
`449`	`449`
Original file line number	Diff line number	Diff line change
`@@ -411,7 +411,7 @@ static int mt9m001_set_fmt(struct v4l2_subdev *sd,`
`411`	`411`
`412`	`412`	`if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE)`
`413`	`413`	`return mt9m001_s_fmt(sd, fmt, mf);`
`414`		`- sd_state->pads->try_fmt = *mf;`
	`414`	`+ v4l2_subdev_get_pad_format(sd, sd_state, 0) = mf;`
`415`	`415`	`return 0;`
`416`	`416`	`}`
`417`	`417`
Original file line number	Diff line number	Diff line change
`@@ -678,7 +678,7 @@ static int mt9m111_set_fmt(struct v4l2_subdev *sd,`
`678`	`678`	`mf->xfer_func = V4L2_XFER_FUNC_DEFAULT;`
`679`	`679`
`680`	`680`	`if (format->which == V4L2_SUBDEV_FORMAT_TRY) {`
`681`		`- sd_state->pads->try_fmt = *mf;`
	`681`	`+ v4l2_subdev_get_pad_format(sd, sd_state, 0) = mf;`
`682`	`682`	`return 0;`
`683`	`683`	`}`
`684`	`684`
Original file line number	Diff line number	Diff line change
`@@ -982,7 +982,7 @@ static int mt9t112_set_fmt(struct v4l2_subdev *sd,`
`982`	`982`
`983`	`983`	`if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE)`
`984`	`984`	`return mt9t112_s_fmt(sd, mf);`
`985`		`- sd_state->pads->try_fmt = *mf;`
	`985`	`+ v4l2_subdev_get_pad_format(sd, sd_state, 0) = mf;`
`986`	`986`
`987`	`987`	`return 0;`
`988`	`988`	`}`
Original file line number	Diff line number	Diff line change
`@@ -358,7 +358,7 @@ static int mt9v011_set_fmt(struct v4l2_subdev *sd,`
`358`	`358`
`359`	`359`	`set_res(sd);`
`360`	`360`	`} else {`
`361`		`- sd_state->pads->try_fmt = *fmt;`
	`361`	`+ v4l2_subdev_get_pad_format(sd, sd_state, 0) = fmt;`
`362`	`362`	`}`
`363`	`363`
`364`	`364`	`return 0;`
Original file line number	Diff line number	Diff line change
`@@ -957,7 +957,7 @@ static int mt9v111_set_format(struct v4l2_subdev *subdev,`
`957`	`957`	`static int mt9v111_init_state(struct v4l2_subdev *subdev,`
`958`	`958`	`struct v4l2_subdev_state *sd_state)`
`959`	`959`	`{`
`960`		`- sd_state->pads->try_fmt = mt9v111_def_fmt;`
	`960`	`+ *v4l2_subdev_get_pad_format(subdev, sd_state, 0) = mt9v111_def_fmt;`
`961`	`961`
`962`	`962`	`return 0;`
`963`	`963`	`}`
Original file line number	Diff line number	Diff line change
`@@ -996,7 +996,7 @@ static int ov2640_set_fmt(struct v4l2_subdev *sd,`
`996`	`996`	`/* select format */`
`997`	`997`	`priv->cfmt_code = mf->code;`
`998`	`998`	`} else {`
`999`		`- sd_state->pads->try_fmt = *mf;`
	`999`	`+ v4l2_subdev_get_pad_format(sd, sd_state, 0) = mf;`
`1000`	`1000`	`}`
`1001`	`1001`	`out:`
`1002`	`1002`	`mutex_unlock(&priv->lock);`
Original file line number	Diff line number	Diff line change
`@@ -1222,7 +1222,7 @@ static int ov772x_set_fmt(struct v4l2_subdev *sd,`
`1222`	`1222`	`mf->xfer_func = V4L2_XFER_FUNC_DEFAULT;`
`1223`	`1223`
`1224`	`1224`	`if (format->which == V4L2_SUBDEV_FORMAT_TRY) {`
`1225`		`- sd_state->pads->try_fmt = *mf;`
	`1225`	`+ v4l2_subdev_get_pad_format(sd, sd_state, 0) = mf;`
`1226`	`1226`	`return 0;`
`1227`	`1227`	`}`
`1228`	`1228`
Original file line number	Diff line number	Diff line change
`@@ -547,7 +547,7 @@ static int ov9640_set_fmt(struct v4l2_subdev *sd,`
`547`	`547`	`if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE)`
`548`	`548`	`return ov9640_s_fmt(sd, mf);`
`549`	`549`
`550`		`- sd_state->pads->try_fmt = *mf;`
	`550`	`+ v4l2_subdev_get_pad_format(sd, sd_state, 0) = mf;`
`551`	`551`
`552`	`552`	`return 0;`
`553`	`553`	`}`