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

[linux-2.6-microblaze.git] / drivers / media / platform / sunxi / sun4i-csi / sun4i_v4l2.c

diff --git a/drivers/media/platform/sunxi/sun4i-csi/sun4i_v4l2.c b/drivers/media/platform/sunxi/sun4i-csi/sun4i_v4l2.c
index 54b9099..3872027 100644 (file)
--- a/drivers/media/platform/sunxi/sun4i-csi/sun4i_v4l2.c
+++ b/drivers/media/platform/sunxi/sun4i-csi/sun4i_v4l2.c
@@ -271,25 +271,26 @@ static const struct v4l2_mbus_framefmt sun4i_csi_pad_fmt_default = {
 };
 
 static int sun4i_csi_subdev_init_cfg(struct v4l2_subdev *subdev,
-                                    struct v4l2_subdev_pad_config *cfg)
+                                    struct v4l2_subdev_state *sd_state)
 {
        struct v4l2_mbus_framefmt *fmt;
 
-       fmt = v4l2_subdev_get_try_format(subdev, cfg, CSI_SUBDEV_SINK);
+       fmt = v4l2_subdev_get_try_format(subdev, sd_state, CSI_SUBDEV_SINK);
        *fmt = sun4i_csi_pad_fmt_default;
 
        return 0;
 }
 
 static int sun4i_csi_subdev_get_fmt(struct v4l2_subdev *subdev,
-                                   struct v4l2_subdev_pad_config *cfg,
+                                   struct v4l2_subdev_state *sd_state,
                                    struct v4l2_subdev_format *fmt)
 {
        struct sun4i_csi *csi = container_of(subdev, struct sun4i_csi, subdev);
        struct v4l2_mbus_framefmt *subdev_fmt;
 
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY)
-               subdev_fmt = v4l2_subdev_get_try_format(subdev, cfg, fmt->pad);
+               subdev_fmt = v4l2_subdev_get_try_format(subdev, sd_state,
+                                                       fmt->pad);
        else
                subdev_fmt = &csi->subdev_fmt;
 
@@ -299,14 +300,15 @@ static int sun4i_csi_subdev_get_fmt(struct v4l2_subdev *subdev,
 }
 
 static int sun4i_csi_subdev_set_fmt(struct v4l2_subdev *subdev,
-                                   struct v4l2_subdev_pad_config *cfg,
+                                   struct v4l2_subdev_state *sd_state,
                                    struct v4l2_subdev_format *fmt)
 {
        struct sun4i_csi *csi = container_of(subdev, struct sun4i_csi, subdev);
        struct v4l2_mbus_framefmt *subdev_fmt;
 
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY)
-               subdev_fmt = v4l2_subdev_get_try_format(subdev, cfg, fmt->pad);
+               subdev_fmt = v4l2_subdev_get_try_format(subdev, sd_state,
+                                                       fmt->pad);
        else
                subdev_fmt = &csi->subdev_fmt;
 
@@ -325,7 +327,7 @@ static int sun4i_csi_subdev_set_fmt(struct v4l2_subdev *subdev,
 
 static int
 sun4i_csi_subdev_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 *mbus)
 {
        if (mbus->index >= ARRAY_SIZE(sun4i_csi_formats))