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

[linux-2.6-microblaze.git] / drivers / staging / media / imx / imx6-mipi-csi2.c

diff --git a/drivers/staging/media/imx/imx6-mipi-csi2.c b/drivers/staging/media/imx/imx6-mipi-csi2.c
index fc2378a..9de0ebd 100644 (file)
--- a/drivers/staging/media/imx/imx6-mipi-csi2.c
+++ b/drivers/staging/media/imx/imx6-mipi-csi2.c
@@ -508,17 +508,17 @@ out:
 }
 
 static struct v4l2_mbus_framefmt *
-__csi2_get_fmt(struct csi2_dev *csi2, struct v4l2_subdev_pad_config *cfg,
+__csi2_get_fmt(struct csi2_dev *csi2, struct v4l2_subdev_state *sd_state,
               unsigned int pad, enum v4l2_subdev_format_whence which)
 {
        if (which == V4L2_SUBDEV_FORMAT_TRY)
-               return v4l2_subdev_get_try_format(&csi2->sd, cfg, pad);
+               return v4l2_subdev_get_try_format(&csi2->sd, sd_state, pad);
        else
                return &csi2->format_mbus;
 }
 
 static int csi2_get_fmt(struct v4l2_subdev *sd,
-                       struct v4l2_subdev_pad_config *cfg,
+                       struct v4l2_subdev_state *sd_state,
                        struct v4l2_subdev_format *sdformat)
 {
        struct csi2_dev *csi2 = sd_to_dev(sd);
@@ -526,7 +526,7 @@ static int csi2_get_fmt(struct v4l2_subdev *sd,
 
        mutex_lock(&csi2->lock);
 
-       fmt = __csi2_get_fmt(csi2, cfg, sdformat->pad, sdformat->which);
+       fmt = __csi2_get_fmt(csi2, sd_state, sdformat->pad, sdformat->which);
 
        sdformat->format = *fmt;
 
@@ -536,7 +536,7 @@ static int csi2_get_fmt(struct v4l2_subdev *sd,
 }
 
 static int csi2_set_fmt(struct v4l2_subdev *sd,
-                       struct v4l2_subdev_pad_config *cfg,
+                       struct v4l2_subdev_state *sd_state,
                        struct v4l2_subdev_format *sdformat)
 {
        struct csi2_dev *csi2 = sd_to_dev(sd);
@@ -557,7 +557,7 @@ static int csi2_set_fmt(struct v4l2_subdev *sd,
        if (sdformat->pad != CSI2_SINK_PAD)
                sdformat->format = csi2->format_mbus;
 
-       fmt = __csi2_get_fmt(csi2, cfg, sdformat->pad, sdformat->which);
+       fmt = __csi2_get_fmt(csi2, sd_state, sdformat->pad, sdformat->which);
 
        *fmt = sdformat->format;
 out: