media: rkisp1: isp: Add container_of wrapper to cast subdev to rkisp1_isp

Replace manual container_of() calls with a static inline wrapper to
increase readability.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Dafna Hirschfeld <dafna@fastmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
index 944b6ea11853409e1ec8637bc2121c56ce871a82..9f4fb984194d93e6b62b19873d25af917d3a73ff 100644 (file)
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
@@ -370,6 +370,11 @@ static void rkisp1_isp_start(struct rkisp1_device *rkisp1)
  * Subdev pad operations
  */
 
+static inline struct rkisp1_isp *to_rkisp1_isp(struct v4l2_subdev *sd)
+{
+       return container_of(sd, struct rkisp1_isp, sd);
+}
+
 static int rkisp1_isp_enum_mbus_code(struct v4l2_subdev *sd,
                                     struct v4l2_subdev_state *sd_state,
                                     struct v4l2_subdev_mbus_code_enum *code)
@@ -625,7 +630,7 @@ static int rkisp1_isp_get_fmt(struct v4l2_subdev *sd,
                              struct v4l2_subdev_state *sd_state,
                              struct v4l2_subdev_format *fmt)
 {
-       struct rkisp1_isp *isp = container_of(sd, struct rkisp1_isp, sd);
+       struct rkisp1_isp *isp = to_rkisp1_isp(sd);
 
        mutex_lock(&isp->ops_lock);
        fmt->format = *rkisp1_isp_get_pad_fmt(isp, sd_state, fmt->pad,
@@ -638,7 +643,7 @@ static int rkisp1_isp_set_fmt(struct v4l2_subdev *sd,
                              struct v4l2_subdev_state *sd_state,
                              struct v4l2_subdev_format *fmt)
 {
-       struct rkisp1_isp *isp = container_of(sd, struct rkisp1_isp, sd);
+       struct rkisp1_isp *isp = to_rkisp1_isp(sd);
 
        mutex_lock(&isp->ops_lock);
        if (fmt->pad == RKISP1_ISP_PAD_SINK_VIDEO)
@@ -659,7 +664,7 @@ static int rkisp1_isp_get_selection(struct v4l2_subdev *sd,
                                    struct v4l2_subdev_state *sd_state,
                                    struct v4l2_subdev_selection *sel)
 {
-       struct rkisp1_isp *isp = container_of(sd, struct rkisp1_isp, sd);
+       struct rkisp1_isp *isp = to_rkisp1_isp(sd);
        int ret = 0;
 
        if (sel->pad != RKISP1_ISP_PAD_SOURCE_VIDEO &&
@@ -701,7 +706,7 @@ static int rkisp1_isp_set_selection(struct v4l2_subdev *sd,
 {
        struct rkisp1_device *rkisp1 =
                container_of(sd->v4l2_dev, struct rkisp1_device, v4l2_dev);
-       struct rkisp1_isp *isp = container_of(sd, struct rkisp1_isp, sd);
+       struct rkisp1_isp *isp = to_rkisp1_isp(sd);
        int ret = 0;
 
        if (sel->target != V4L2_SEL_TGT_CROP)
@@ -748,7 +753,7 @@ 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 = &rkisp1->isp;
+       struct rkisp1_isp *isp = to_rkisp1_isp(sd);
        struct rkisp1_sensor_async *asd;
        int ret;