media: v4l2-subdev: add subdev-wide state struct

[linux-2.6-microblaze.git] / drivers / media / platform / vsp1 / vsp1_sru.c

diff --git a/drivers/media/platform/vsp1/vsp1_sru.c b/drivers/media/platform/vsp1/vsp1_sru.c
index 2b65457..b614a2a 100644 (file)
--- a/drivers/media/platform/vsp1/vsp1_sru.c
+++ b/drivers/media/platform/vsp1/vsp1_sru.c
@@ -106,7 +106,7 @@ static const struct v4l2_ctrl_config sru_intensity_control = {
  */
 
 static int sru_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)
 {
        static const unsigned int codes[] = {
@@ -114,20 +114,21 @@ static int sru_enum_mbus_code(struct v4l2_subdev *subdev,
                MEDIA_BUS_FMT_AYUV8_1X32,
        };
 
-       return vsp1_subdev_enum_mbus_code(subdev, cfg, code, codes,
+       return vsp1_subdev_enum_mbus_code(subdev, sd_state, code, codes,
                                          ARRAY_SIZE(codes));
 }
 
 static int sru_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)
 {
        struct vsp1_sru *sru = to_sru(subdev);
-       struct v4l2_subdev_pad_config *config;
+       struct v4l2_subdev_state *config;
        struct v4l2_mbus_framefmt *format;
        int ret = 0;
 
-       config = vsp1_entity_get_pad_config(&sru->entity, cfg, fse->which);
+       config = vsp1_entity_get_pad_config(&sru->entity, sd_state,
+                                           fse->which);
        if (!config)
                return -EINVAL;
 
@@ -164,7 +165,7 @@ done:
 }
 
 static void sru_try_format(struct vsp1_sru *sru,
-                          struct v4l2_subdev_pad_config *config,
+                          struct v4l2_subdev_state *sd_state,
                           unsigned int pad, struct v4l2_mbus_framefmt *fmt)
 {
        struct v4l2_mbus_framefmt *format;
@@ -184,7 +185,7 @@ static void sru_try_format(struct vsp1_sru *sru,
 
        case SRU_PAD_SOURCE:
                /* The SRU can't perform format conversion. */
-               format = vsp1_entity_get_pad_format(&sru->entity, config,
+               format = vsp1_entity_get_pad_format(&sru->entity, sd_state,
                                                    SRU_PAD_SINK);
                fmt->code = format->code;
 
@@ -216,17 +217,18 @@ static void sru_try_format(struct vsp1_sru *sru,
 }
 
 static int sru_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_sru *sru = to_sru(subdev);
-       struct v4l2_subdev_pad_config *config;
+       struct v4l2_subdev_state *config;
        struct v4l2_mbus_framefmt *format;
        int ret = 0;
 
        mutex_lock(&sru->entity.lock);
 
-       config = vsp1_entity_get_pad_config(&sru->entity, cfg, fmt->which);
+       config = vsp1_entity_get_pad_config(&sru->entity, sd_state,
+                                           fmt->which);
        if (!config) {
                ret = -EINVAL;
                goto done;