Merge branch 'tracing/kmemtrace' into tracing/kmemtrace2

1 files changed, 26 insertions, 20 deletions

diff --git a/drivers/media/video/mt9v022.c b/drivers/media/video/mt9v022.c
index 2584201059d8..14a5f9c21ffa 100644
--- a/drivers/media/video/mt9v022.c
+++ b/drivers/media/video/mt9v022.c
@@ -273,6 +273,7 @@ static int mt9v022_set_bus_param(struct soc_camera_device *icd,
                                  unsigned long flags)
 {
         struct mt9v022 *mt9v022 = container_of(icd, struct mt9v022, icd);
+        struct soc_camera_link *icl = mt9v022->client->dev.platform_data;
         unsigned int width_flag = flags & SOCAM_DATAWIDTH_MASK;
         int ret;
         u16 pixclk = 0;
@@ -296,6 +297,8 @@ static int mt9v022_set_bus_param(struct soc_camera_device *icd,
                 mt9v022->datawidth = width_flag == SOCAM_DATAWIDTH_8 ? 8 : 10;
         }
 
+        flags = soc_camera_apply_sensor_flags(icl, flags);
+
         if (flags & SOCAM_PCLK_SAMPLE_RISING)
                 pixclk |= 0x10;
 
@@ -337,14 +340,14 @@ static unsigned long mt9v022_query_bus_param(struct soc_camera_device *icd)
                 width_flag;
 }
 
-static int mt9v022_set_fmt_cap(struct soc_camera_device *icd,
-                __u32 pixfmt, struct v4l2_rect *rect)
+static int mt9v022_set_fmt(struct soc_camera_device *icd,
+                           __u32 pixfmt, struct v4l2_rect *rect)
 {
         struct mt9v022 *mt9v022 = container_of(icd, struct mt9v022, icd);
         int ret;
 
         /* The caller provides a supported format, as verified per call to
-         * icd->try_fmt_cap(), datawidth is from our supported format list */
+         * icd->try_fmt(), datawidth is from our supported format list */
         switch (pixfmt) {
         case V4L2_PIX_FMT_GREY:
         case V4L2_PIX_FMT_Y16:
@@ -400,18 +403,20 @@ static int mt9v022_set_fmt_cap(struct soc_camera_device *icd,
         return 0;
 }
 
-static int mt9v022_try_fmt_cap(struct soc_camera_device *icd,
-                               struct v4l2_format *f)
+static int mt9v022_try_fmt(struct soc_camera_device *icd,
+                           struct v4l2_format *f)
 {
-        if (f->fmt.pix.height < 32 + icd->y_skip_top)
-                f->fmt.pix.height = 32 + icd->y_skip_top;
-        if (f->fmt.pix.height > 480 + icd->y_skip_top)
-                f->fmt.pix.height = 480 + icd->y_skip_top;
-        if (f->fmt.pix.width < 48)
-                f->fmt.pix.width = 48;
-        if (f->fmt.pix.width > 752)
-                f->fmt.pix.width = 752;
-        f->fmt.pix.width &= ~0x03; /* ? */
+        struct v4l2_pix_format *pix = &f->fmt.pix;
+
+        if (pix->height < 32 + icd->y_skip_top)
+                pix->height = 32 + icd->y_skip_top;
+        if (pix->height > 480 + icd->y_skip_top)
+                pix->height = 480 + icd->y_skip_top;
+        if (pix->width < 48)
+                pix->width = 48;
+        if (pix->width > 752)
+                pix->width = 752;
+        pix->width &= ~0x03; /* ? */
 
         return 0;
 }
@@ -538,8 +543,8 @@ static struct soc_camera_ops mt9v022_ops = {
         .release                = mt9v022_release,
         .start_capture          = mt9v022_start_capture,
         .stop_capture           = mt9v022_stop_capture,
-        .set_fmt_cap            = mt9v022_set_fmt_cap,
-        .try_fmt_cap            = mt9v022_try_fmt_cap,
+        .set_fmt                = mt9v022_set_fmt,
+        .try_fmt                = mt9v022_try_fmt,
         .set_bus_param          = mt9v022_set_bus_param,
         .query_bus_param        = mt9v022_query_bus_param,
         .controls               = mt9v022_controls,
@@ -690,6 +695,7 @@ static int mt9v022_set_control(struct soc_camera_device *icd,
 static int mt9v022_video_probe(struct soc_camera_device *icd)
 {
         struct mt9v022 *mt9v022 = container_of(icd, struct mt9v022, icd);
+        struct soc_camera_link *icl = mt9v022->client->dev.platform_data;
         s32 data;
         int ret;
 
@@ -725,7 +731,7 @@ static int mt9v022_video_probe(struct soc_camera_device *icd)
                 ret = reg_write(icd, MT9V022_PIXEL_OPERATION_MODE, 4 | 0x11);
                 mt9v022->model = V4L2_IDENT_MT9V022IX7ATC;
                 icd->formats = mt9v022_colour_formats;
-                if (mt9v022->client->dev.platform_data)
+                if (gpio_is_valid(icl->gpio))
                         icd->num_formats = ARRAY_SIZE(mt9v022_colour_formats);
                 else
                         icd->num_formats = 1;
@@ -733,7 +739,7 @@ static int mt9v022_video_probe(struct soc_camera_device *icd)
                 ret = reg_write(icd, MT9V022_PIXEL_OPERATION_MODE, 0x11);
                 mt9v022->model = V4L2_IDENT_MT9V022IX7ATM;
                 icd->formats = mt9v022_monochrome_formats;
-                if (mt9v022->client->dev.platform_data)
+                if (gpio_is_valid(icl->gpio))
                         icd->num_formats = ARRAY_SIZE(mt9v022_monochrome_formats);
                 else
                         icd->num_formats = 1;
@@ -760,8 +766,8 @@ static void mt9v022_video_remove(struct soc_camera_device *icd)
         struct mt9v022 *mt9v022 = container_of(icd, struct mt9v022, icd);
 
         dev_dbg(&icd->dev, "Video %x removed: %p, %p\n", mt9v022->client->addr,
-                mt9v022->icd.dev.parent, mt9v022->icd.vdev);
-        soc_camera_video_stop(&mt9v022->icd);
+                icd->dev.parent, icd->vdev);
+        soc_camera_video_stop(icd);
 }
 
 static int mt9v022_probe(struct i2c_client *client,