[PATCH 29/55] media: rkisp1: isp: Add rkisp1_device backpointer to rkisp1_isp

[Dafna Hirschfeld]

On 15.06.2022 04:11, Paul Elder wrote:
>From: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
>
>The rkisp1_isp structure documentation mentions a backpointer field to
>rkisp1_device, but the field is missing. Add it, and use it to replace
>more complicated constructs using container_of() on the v4l2_device.
>
>Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>

Reviewed-by Dafna Hirschfeld <dafna at fastmail.com>

>---
> .../media/platform/rockchip/rkisp1/rkisp1-common.h    |  1 +
> drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c   | 11 +++++------
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
>diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
>index 7a6f55a31bb0..3c55e922346e 100644
>--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
>+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
>@@ -162,6 +162,7 @@ struct rkisp1_csi {
>  */
> struct rkisp1_isp {
> 	struct v4l2_subdev sd;
>+	struct rkisp1_device *rkisp1;
> 	struct media_pad pads[RKISP1_ISP_PAD_MAX];
> 	struct v4l2_subdev_pad_config pad_cfg[RKISP1_ISP_PAD_MAX];
> 	const struct rkisp1_mbus_info *sink_fmt;
>diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
>index 812fb2ea5323..f8ab1d9cc8cd 100644
>--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
>+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
>@@ -704,15 +704,13 @@ static int rkisp1_isp_set_selection(struct v4l2_subdev *sd,
> 				    struct v4l2_subdev_state *sd_state,
> 				    struct v4l2_subdev_selection *sel)
> {
>-	struct rkisp1_device *rkisp1 =
>-		container_of(sd->v4l2_dev, struct rkisp1_device, v4l2_dev);
> 	struct rkisp1_isp *isp = to_rkisp1_isp(sd);
> 	int ret = 0;
>
> 	if (sel->target != V4L2_SEL_TGT_CROP)
> 		return -EINVAL;
>
>-	dev_dbg(rkisp1->dev, "%s: pad: %d sel(%d,%d)/%dx%d\n", __func__,
>+	dev_dbg(isp->rkisp1->dev, "%s: pad: %d sel(%d,%d)/%dx%d\n", __func__,
> 		sel->pad, sel->r.left, sel->r.top, sel->r.width, sel->r.height);
> 	mutex_lock(&isp->ops_lock);
> 	if (sel->pad == RKISP1_ISP_PAD_SINK_VIDEO)
>@@ -751,9 +749,8 @@ static const struct v4l2_subdev_pad_ops rkisp1_isp_pad_ops = {
>
> static int rkisp1_isp_s_stream(struct v4l2_subdev *sd, int enable)
> {
>-	struct rkisp1_device *rkisp1 =
>-		container_of(sd->v4l2_dev, struct rkisp1_device, v4l2_dev);
> 	struct rkisp1_isp *isp = to_rkisp1_isp(sd);
>+	struct rkisp1_device *rkisp1 = isp->rkisp1;
> 	struct rkisp1_sensor_async *asd;
> 	int ret;
>
>@@ -840,12 +837,14 @@ int rkisp1_isp_register(struct rkisp1_device *rkisp1)
> {
> 	struct v4l2_subdev_state state = {
> 		.pads = rkisp1->isp.pad_cfg
>-		};
>+	};
> 	struct rkisp1_isp *isp = &rkisp1->isp;
> 	struct media_pad *pads = isp->pads;
> 	struct v4l2_subdev *sd = &isp->sd;
> 	int ret;
>
>+	isp->rkisp1 = rkisp1;
>+
> 	v4l2_subdev_init(sd, &rkisp1_isp_ops);
> 	sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE | V4L2_SUBDEV_FL_HAS_EVENTS;
> 	sd->entity.ops = &rkisp1_isp_media_ops;
>-- 
>2.30.2
>