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

[linux-2.6-microblaze.git] / drivers / media / platform / rcar-vin / rcar-csi2.c

diff --git a/drivers/media/platform/rcar-vin/rcar-csi2.c b/drivers/media/platform/rcar-vin/rcar-csi2.c
index b87d545..a128bf8 100644 (file)
--- a/drivers/media/platform/rcar-vin/rcar-csi2.c
+++ b/drivers/media/platform/rcar-vin/rcar-csi2.c
@@ -717,7 +717,7 @@ out:
 }
 
 static int rcsi2_set_pad_format(struct v4l2_subdev *sd,
-                               struct v4l2_subdev_pad_config *cfg,
+                               struct v4l2_subdev_state *sd_state,
                                struct v4l2_subdev_format *format)
 {
        struct rcar_csi2 *priv = sd_to_csi2(sd);
@@ -729,7 +729,7 @@ static int rcsi2_set_pad_format(struct v4l2_subdev *sd,
        if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE) {
                priv->mf = format->format;
        } else {
-               framefmt = v4l2_subdev_get_try_format(sd, cfg, 0);
+               framefmt = v4l2_subdev_get_try_format(sd, sd_state, 0);
                *framefmt = format->format;
        }
 
@@ -737,7 +737,7 @@ static int rcsi2_set_pad_format(struct v4l2_subdev *sd,
 }
 
 static int rcsi2_get_pad_format(struct v4l2_subdev *sd,
-                               struct v4l2_subdev_pad_config *cfg,
+                               struct v4l2_subdev_state *sd_state,
                                struct v4l2_subdev_format *format)
 {
        struct rcar_csi2 *priv = sd_to_csi2(sd);
@@ -745,7 +745,7 @@ static int rcsi2_get_pad_format(struct v4l2_subdev *sd,
        if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE)
                format->format = priv->mf;
        else
-               format->format = *v4l2_subdev_get_try_format(sd, cfg, 0);
+               format->format = *v4l2_subdev_get_try_format(sd, sd_state, 0);
 
        return 0;
 }