Merge tag 'selinux-pr-20210629' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / drivers / media / platform / vsp1 / vsp1_histo.c

diff --git a/drivers/media/platform/vsp1/vsp1_histo.c b/drivers/media/platform/vsp1/vsp1_histo.c
index a91e142bcb9480ced285aa17fdef7b9e84bf5650..5e5013d2cd2ad87f7853f437325c713a55d82d25 100644 (file)
--- a/drivers/media/platform/vsp1/vsp1_histo.c
+++ b/drivers/media/platform/vsp1/vsp1_histo.c
@@ -170,7 +170,7 @@ static const struct vb2_ops histo_video_queue_qops = {
  */
 
 static int histo_enum_mbus_code(struct v4l2_subdev *subdev,
-                               struct v4l2_subdev_pad_config *cfg,
+                               struct v4l2_subdev_state *sd_state,
                                struct v4l2_subdev_mbus_code_enum *code)
 {
        struct vsp1_histogram *histo = subdev_to_histo(subdev);
@@ -180,28 +180,30 @@ static int histo_enum_mbus_code(struct v4l2_subdev *subdev,
                return 0;
        }
 
-       return vsp1_subdev_enum_mbus_code(subdev, cfg, code, histo->formats,
+       return vsp1_subdev_enum_mbus_code(subdev, sd_state, code,
+                                         histo->formats,
                                          histo->num_formats);
 }
 
 static int histo_enum_frame_size(struct v4l2_subdev *subdev,
-                                struct v4l2_subdev_pad_config *cfg,
+                                struct v4l2_subdev_state *sd_state,
                                 struct v4l2_subdev_frame_size_enum *fse)
 {
        if (fse->pad != HISTO_PAD_SINK)
                return -EINVAL;
 
-       return vsp1_subdev_enum_frame_size(subdev, cfg, fse, HISTO_MIN_SIZE,
+       return vsp1_subdev_enum_frame_size(subdev, sd_state, fse,
+                                          HISTO_MIN_SIZE,
                                           HISTO_MIN_SIZE, HISTO_MAX_SIZE,
                                           HISTO_MAX_SIZE);
 }
 
 static int histo_get_selection(struct v4l2_subdev *subdev,
-                              struct v4l2_subdev_pad_config *cfg,
+                              struct v4l2_subdev_state *sd_state,
                               struct v4l2_subdev_selection *sel)
 {
        struct vsp1_histogram *histo = subdev_to_histo(subdev);
-       struct v4l2_subdev_pad_config *config;
+       struct v4l2_subdev_state *config;
        struct v4l2_mbus_framefmt *format;
        struct v4l2_rect *crop;
        int ret = 0;
@@ -211,7 +213,8 @@ static int histo_get_selection(struct v4l2_subdev *subdev,
 
        mutex_lock(&histo->entity.lock);
 
-       config = vsp1_entity_get_pad_config(&histo->entity, cfg, sel->which);
+       config = vsp1_entity_get_pad_config(&histo->entity, sd_state,
+                                           sel->which);
        if (!config) {
                ret = -EINVAL;
                goto done;
@@ -256,15 +259,15 @@ done:
 }
 
 static int histo_set_crop(struct v4l2_subdev *subdev,
-                         struct v4l2_subdev_pad_config *config,
-                        struct v4l2_subdev_selection *sel)
+                         struct v4l2_subdev_state *sd_state,
+                         struct v4l2_subdev_selection *sel)
 {
        struct vsp1_histogram *histo = subdev_to_histo(subdev);
        struct v4l2_mbus_framefmt *format;
        struct v4l2_rect *selection;
 
        /* The crop rectangle must be inside the input frame. */
-       format = vsp1_entity_get_pad_format(&histo->entity, config,
+       format = vsp1_entity_get_pad_format(&histo->entity, sd_state,
                                            HISTO_PAD_SINK);
        sel->r.left = clamp_t(unsigned int, sel->r.left, 0, format->width - 1);
        sel->r.top = clamp_t(unsigned int, sel->r.top, 0, format->height - 1);
@@ -274,11 +277,11 @@ static int histo_set_crop(struct v4l2_subdev *subdev,
                                format->height - sel->r.top);
 
        /* Set the crop rectangle and reset the compose rectangle. */
-       selection = vsp1_entity_get_pad_selection(&histo->entity, config,
+       selection = vsp1_entity_get_pad_selection(&histo->entity, sd_state,
                                                  sel->pad, V4L2_SEL_TGT_CROP);
        *selection = sel->r;
 
-       selection = vsp1_entity_get_pad_selection(&histo->entity, config,
+       selection = vsp1_entity_get_pad_selection(&histo->entity, sd_state,
                                                  sel->pad,
                                                  V4L2_SEL_TGT_COMPOSE);
        *selection = sel->r;
@@ -287,7 +290,7 @@ static int histo_set_crop(struct v4l2_subdev *subdev,
 }
 
 static int histo_set_compose(struct v4l2_subdev *subdev,
-                            struct v4l2_subdev_pad_config *config,
+                            struct v4l2_subdev_state *sd_state,
                             struct v4l2_subdev_selection *sel)
 {
        struct vsp1_histogram *histo = subdev_to_histo(subdev);
@@ -303,7 +306,8 @@ static int histo_set_compose(struct v4l2_subdev *subdev,
        sel->r.left = 0;
        sel->r.top = 0;
 
-       crop = vsp1_entity_get_pad_selection(&histo->entity, config, sel->pad,
+       crop = vsp1_entity_get_pad_selection(&histo->entity, sd_state,
+                                            sel->pad,
                                             V4L2_SEL_TGT_CROP);
 
        /*
@@ -329,7 +333,7 @@ static int histo_set_compose(struct v4l2_subdev *subdev,
        ratio = 1 << (crop->height * 2 / sel->r.height / 3);
        sel->r.height = crop->height / ratio;
 
-       compose = vsp1_entity_get_pad_selection(&histo->entity, config,
+       compose = vsp1_entity_get_pad_selection(&histo->entity, sd_state,
                                                sel->pad,
                                                V4L2_SEL_TGT_COMPOSE);
        *compose = sel->r;
@@ -338,11 +342,11 @@ static int histo_set_compose(struct v4l2_subdev *subdev,
 }
 
 static int histo_set_selection(struct v4l2_subdev *subdev,
-                              struct v4l2_subdev_pad_config *cfg,
+                              struct v4l2_subdev_state *sd_state,
                               struct v4l2_subdev_selection *sel)
 {
        struct vsp1_histogram *histo = subdev_to_histo(subdev);
-       struct v4l2_subdev_pad_config *config;
+       struct v4l2_subdev_state *config;
        int ret;
 
        if (sel->pad != HISTO_PAD_SINK)
@@ -350,7 +354,8 @@ static int histo_set_selection(struct v4l2_subdev *subdev,
 
        mutex_lock(&histo->entity.lock);
 
-       config = vsp1_entity_get_pad_config(&histo->entity, cfg, sel->which);
+       config = vsp1_entity_get_pad_config(&histo->entity, sd_state,
+                                           sel->which);
        if (!config) {
                ret = -EINVAL;
                goto done;
@@ -369,7 +374,7 @@ done:
 }
 
 static int histo_get_format(struct v4l2_subdev *subdev,
-                           struct v4l2_subdev_pad_config *cfg,
+                           struct v4l2_subdev_state *sd_state,
                            struct v4l2_subdev_format *fmt)
 {
        if (fmt->pad == HISTO_PAD_SOURCE) {
@@ -381,19 +386,19 @@ static int histo_get_format(struct v4l2_subdev *subdev,
                return 0;
        }
 
-       return vsp1_subdev_get_pad_format(subdev, cfg, fmt);
+       return vsp1_subdev_get_pad_format(subdev, sd_state, fmt);
 }
 
 static int histo_set_format(struct v4l2_subdev *subdev,
-                           struct v4l2_subdev_pad_config *cfg,
+                           struct v4l2_subdev_state *sd_state,
                            struct v4l2_subdev_format *fmt)
 {
        struct vsp1_histogram *histo = subdev_to_histo(subdev);
 
        if (fmt->pad != HISTO_PAD_SINK)
-               return histo_get_format(subdev, cfg, fmt);
+               return histo_get_format(subdev, sd_state, fmt);
 
-       return vsp1_subdev_set_pad_format(subdev, cfg, fmt,
+       return vsp1_subdev_set_pad_format(subdev, sd_state, fmt,
                                          histo->formats, histo->num_formats,
                                          HISTO_MIN_SIZE, HISTO_MIN_SIZE,
                                          HISTO_MAX_SIZE, HISTO_MAX_SIZE);