1 files changed, 9 insertions, 8 deletions

diff --git a/drivers/media/video/soc_camera_platform.c b/drivers/media/video/soc_camera_platform.c
index bb7a9d480e8f..013ab06e3180 100644
--- a/drivers/media/video/soc_camera_platform.c
+++ b/drivers/media/video/soc_camera_platform.c
@@ -79,19 +79,20 @@ soc_camera_platform_query_bus_param(struct soc_camera_device *icd)
         return p->bus_param;
 }
 
-static int soc_camera_platform_set_fmt_cap(struct soc_camera_device *icd,
-                                           __u32 pixfmt, struct v4l2_rect *rect)
+static int soc_camera_platform_set_fmt(struct soc_camera_device *icd,
+                                       __u32 pixfmt, struct v4l2_rect *rect)
 {
         return 0;
 }
 
-static int soc_camera_platform_try_fmt_cap(struct soc_camera_device *icd,
-                                           struct v4l2_format *f)
+static int soc_camera_platform_try_fmt(struct soc_camera_device *icd,
+                                       struct v4l2_format *f)
 {
         struct soc_camera_platform_info *p = soc_camera_platform_get_info(icd);
+        struct v4l2_pix_format *pix = &f->fmt.pix;
 
-        f->fmt.pix.width = p->format.width;
-        f->fmt.pix.height = p->format.height;
+        pix->width = p->format.width;
+        pix->height = p->format.height;
         return 0;
 }
 
@@ -124,8 +125,8 @@ static struct soc_camera_ops soc_camera_platform_ops = {
         .release                = soc_camera_platform_release,
         .start_capture          = soc_camera_platform_start_capture,
         .stop_capture           = soc_camera_platform_stop_capture,
-        .set_fmt_cap            = soc_camera_platform_set_fmt_cap,
-        .try_fmt_cap            = soc_camera_platform_try_fmt_cap,
+        .set_fmt                = soc_camera_platform_set_fmt,
+        .try_fmt                = soc_camera_platform_try_fmt,
         .set_bus_param          = soc_camera_platform_set_bus_param,
         .query_bus_param        = soc_camera_platform_query_bus_param,
 };