1 files changed, 9 insertions, 9 deletions

diff --git a/drivers/media/platform/s3c-camif/camif-capture.c b/drivers/media/platform/s3c-camif/camif-capture.c
index 54479d60cc0d..f6a61b9ceff4 100644
--- a/drivers/media/platform/s3c-camif/camif-capture.c
+++ b/drivers/media/platform/s3c-camif/camif-capture.c
@@ -1219,7 +1219,7 @@ static const u32 camif_mbus_formats[] = {
  */
 
 static int s3c_camif_subdev_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(camif_mbus_formats))
@@ -1230,14 +1230,14 @@ static int s3c_camif_subdev_enum_mbus_code(struct v4l2_subdev *sd,
 }
 
 static int s3c_camif_subdev_get_fmt(struct v4l2_subdev *sd,
-                                    struct v4l2_subdev_fh *fh,
+                                    struct v4l2_subdev_pad_config *cfg,
                                     struct v4l2_subdev_format *fmt)
 {
         struct camif_dev *camif = v4l2_get_subdevdata(sd);
         struct v4l2_mbus_framefmt *mf = &fmt->format;
 
         if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-                mf = v4l2_subdev_get_try_format(fh, fmt->pad);
+                mf = v4l2_subdev_get_try_format(sd, cfg, fmt->pad);
                 fmt->format = *mf;
                 return 0;
         }
@@ -1297,7 +1297,7 @@ static void __camif_subdev_try_format(struct camif_dev *camif,
 }
 
 static int s3c_camif_subdev_set_fmt(struct v4l2_subdev *sd,
-                                    struct v4l2_subdev_fh *fh,
+                                    struct v4l2_subdev_pad_config *cfg,
                                     struct v4l2_subdev_format *fmt)
 {
         struct camif_dev *camif = v4l2_get_subdevdata(sd);
@@ -1325,7 +1325,7 @@ static int s3c_camif_subdev_set_fmt(struct v4l2_subdev *sd,
         __camif_subdev_try_format(camif, mf, fmt->pad);
 
         if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-                mf = v4l2_subdev_get_try_format(fh, fmt->pad);
+                mf = v4l2_subdev_get_try_format(sd, cfg, fmt->pad);
                 *mf = fmt->format;
                 mutex_unlock(&camif->lock);
                 return 0;
@@ -1364,7 +1364,7 @@ static int s3c_camif_subdev_set_fmt(struct v4l2_subdev *sd,
 }
 
 static int s3c_camif_subdev_get_selection(struct v4l2_subdev *sd,
-                                          struct v4l2_subdev_fh *fh,
+                                          struct v4l2_subdev_pad_config *cfg,
                                           struct v4l2_subdev_selection *sel)
 {
         struct camif_dev *camif = v4l2_get_subdevdata(sd);
@@ -1377,7 +1377,7 @@ static int s3c_camif_subdev_get_selection(struct v4l2_subdev *sd,
                 return -EINVAL;
 
         if (sel->which == V4L2_SUBDEV_FORMAT_TRY) {
-                sel->r = *v4l2_subdev_get_try_crop(fh, sel->pad);
+                sel->r = *v4l2_subdev_get_try_crop(sd, cfg, sel->pad);
                 return 0;
         }
 
@@ -1451,7 +1451,7 @@ static void __camif_try_crop(struct camif_dev *camif, struct v4l2_rect *r)
 }
 
 static int s3c_camif_subdev_set_selection(struct v4l2_subdev *sd,
-                                          struct v4l2_subdev_fh *fh,
+                                          struct v4l2_subdev_pad_config *cfg,
                                           struct v4l2_subdev_selection *sel)
 {
         struct camif_dev *camif = v4l2_get_subdevdata(sd);
@@ -1465,7 +1465,7 @@ static int s3c_camif_subdev_set_selection(struct v4l2_subdev *sd,
         __camif_try_crop(camif, &sel->r);
 
         if (sel->which == V4L2_SUBDEV_FORMAT_TRY) {
-                *v4l2_subdev_get_try_crop(fh, sel->pad) = sel->r;
+                *v4l2_subdev_get_try_crop(sd, cfg, sel->pad) = sel->r;
         } else {
                 unsigned long flags;
                 unsigned int i;