1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/media/platform/exynos4-is/mipi-csis.c b/drivers/media/platform/exynos4-is/mipi-csis.c
index 2504aa89a6f4..d74e1bec3d86 100644
--- a/drivers/media/platform/exynos4-is/mipi-csis.c
+++ b/drivers/media/platform/exynos4-is/mipi-csis.c
@@ -540,7 +540,7 @@ unlock:
 }
 
 static int s5pcsis_enum_mbus_code(struct v4l2_subdev *sd,
-                                  struct v4l2_subdev_fh *fh,
+                                  struct v4l2_subdev_pad_config *cfg,
                                   struct v4l2_subdev_mbus_code_enum *code)
 {
         if (code->index >= ARRAY_SIZE(s5pcsis_formats))
@@ -568,23 +568,23 @@ static struct csis_pix_format const *s5pcsis_try_format(
 }
 
 static struct v4l2_mbus_framefmt *__s5pcsis_get_format(
-                struct csis_state *state, struct v4l2_subdev_fh *fh,
+                struct csis_state *state, struct v4l2_subdev_pad_config *cfg,
                 enum v4l2_subdev_format_whence which)
 {
         if (which == V4L2_SUBDEV_FORMAT_TRY)
-                return fh ? v4l2_subdev_get_try_format(fh, 0) : NULL;
+                return cfg ? v4l2_subdev_get_try_format(&state->sd, cfg, 0) : NULL;
 
         return &state->format;
 }
 
-static int s5pcsis_set_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
+static int s5pcsis_set_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config *cfg,
                            struct v4l2_subdev_format *fmt)
 {
         struct csis_state *state = sd_to_csis_state(sd);
         struct csis_pix_format const *csis_fmt;
         struct v4l2_mbus_framefmt *mf;
 
-        mf = __s5pcsis_get_format(state, fh, fmt->which);
+        mf = __s5pcsis_get_format(state, cfg, fmt->which);
 
         if (fmt->pad == CSIS_PAD_SOURCE) {
                 if (mf) {
@@ -605,13 +605,13 @@ static int s5pcsis_set_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
         return 0;
 }
 
-static int s5pcsis_get_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
+static int s5pcsis_get_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config *cfg,
                            struct v4l2_subdev_format *fmt)
 {
         struct csis_state *state = sd_to_csis_state(sd);
         struct v4l2_mbus_framefmt *mf;
 
-        mf = __s5pcsis_get_format(state, fh, fmt->which);
+        mf = __s5pcsis_get_format(state, cfg, fmt->which);
         if (!mf)
                 return -EINVAL;
 
@@ -651,7 +651,7 @@ static int s5pcsis_log_status(struct v4l2_subdev *sd)
 
 static int s5pcsis_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
 {
-        struct v4l2_mbus_framefmt *format = v4l2_subdev_get_try_format(fh, 0);
+        struct v4l2_mbus_framefmt *format = v4l2_subdev_get_try_format(sd, fh->pad, 0);
 
         format->colorspace = V4L2_COLORSPACE_JPEG;
         format->code = s5pcsis_formats[0].code;