1 files changed, 31 insertions, 29 deletions

diff --git a/drivers/media/video/mt9m001.c b/drivers/media/video/mt9m001.c
index 0c524376b67e..1a1a12453672 100644
--- a/drivers/media/video/mt9m001.c
+++ b/drivers/media/video/mt9m001.c
@@ -272,21 +272,20 @@ static int mt9m001_set_bus_param(struct soc_camera_device *icd,
 static unsigned long mt9m001_query_bus_param(struct soc_camera_device *icd)
 {
         struct mt9m001 *mt9m001 = container_of(icd, struct mt9m001, icd);
-        unsigned int width_flag = SOCAM_DATAWIDTH_10;
+        struct soc_camera_link *icl = mt9m001->client->dev.platform_data;
+        /* MT9M001 has all capture_format parameters fixed */
+        unsigned long flags = SOCAM_DATAWIDTH_10 | SOCAM_PCLK_SAMPLE_RISING |
+                SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_HIGH |
+                SOCAM_MASTER;
 
         if (bus_switch_possible(mt9m001))
-                width_flag |= SOCAM_DATAWIDTH_8;
+                flags |= SOCAM_DATAWIDTH_8;
 
-        /* MT9M001 has all capture_format parameters fixed */
-        return SOCAM_PCLK_SAMPLE_RISING |
-                SOCAM_HSYNC_ACTIVE_HIGH |
-                SOCAM_VSYNC_ACTIVE_HIGH |
-                SOCAM_MASTER |
-                width_flag;
+        return soc_camera_apply_sensor_flags(icl, flags);
 }
 
-static int mt9m001_set_fmt_cap(struct soc_camera_device *icd,
-                __u32 pixfmt, struct v4l2_rect *rect)
+static int mt9m001_set_fmt(struct soc_camera_device *icd,
+                           __u32 pixfmt, struct v4l2_rect *rect)
 {
         struct mt9m001 *mt9m001 = container_of(icd, struct mt9m001, icd);
         int ret;
@@ -298,7 +297,7 @@ static int mt9m001_set_fmt_cap(struct soc_camera_device *icd,
                 ret = reg_write(icd, MT9M001_VERTICAL_BLANKING, vblank);
 
         /* The caller provides a supported format, as verified per
-         * call to icd->try_fmt_cap() */
+         * call to icd->try_fmt() */
         if (!ret)
                 ret = reg_write(icd, MT9M001_COLUMN_START, rect->left);
         if (!ret)
@@ -325,18 +324,20 @@ static int mt9m001_set_fmt_cap(struct soc_camera_device *icd,
         return ret;
 }
 
-static int mt9m001_try_fmt_cap(struct soc_camera_device *icd,
-                               struct v4l2_format *f)
+static int mt9m001_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 > 1024 + icd->y_skip_top)
-                f->fmt.pix.height = 1024 + icd->y_skip_top;
-        if (f->fmt.pix.width < 48)
-                f->fmt.pix.width = 48;
-        if (f->fmt.pix.width > 1280)
-                f->fmt.pix.width = 1280;
-        f->fmt.pix.width &= ~0x01; /* has to be even, unsure why was ~3 */
+        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 > 1024 + icd->y_skip_top)
+                pix->height = 1024 + icd->y_skip_top;
+        if (pix->width < 48)
+                pix->width = 48;
+        if (pix->width > 1280)
+                pix->width = 1280;
+        pix->width &= ~0x01; /* has to be even, unsure why was ~3 */
 
         return 0;
 }
@@ -447,8 +448,8 @@ static struct soc_camera_ops mt9m001_ops = {
         .release                = mt9m001_release,
         .start_capture          = mt9m001_start_capture,
         .stop_capture           = mt9m001_stop_capture,
-        .set_fmt_cap            = mt9m001_set_fmt_cap,
-        .try_fmt_cap            = mt9m001_try_fmt_cap,
+        .set_fmt                = mt9m001_set_fmt,
+        .try_fmt                = mt9m001_try_fmt,
         .set_bus_param          = mt9m001_set_bus_param,
         .query_bus_param        = mt9m001_query_bus_param,
         .controls               = mt9m001_controls,
@@ -578,6 +579,7 @@ static int mt9m001_set_control(struct soc_camera_device *icd, struct v4l2_contro
 static int mt9m001_video_probe(struct soc_camera_device *icd)
 {
         struct mt9m001 *mt9m001 = container_of(icd, struct mt9m001, icd);
+        struct soc_camera_link *icl = mt9m001->client->dev.platform_data;
         s32 data;
         int ret;
 
@@ -588,7 +590,7 @@ static int mt9m001_video_probe(struct soc_camera_device *icd)
                 return -ENODEV;
 
         /* Enable the chip */
-        data = reg_write(&mt9m001->icd, MT9M001_CHIP_ENABLE, 1);
+        data = reg_write(icd, MT9M001_CHIP_ENABLE, 1);
         dev_dbg(&icd->dev, "write: %d\n", data);
 
         /* Read out the chip version register */
@@ -600,7 +602,7 @@ static int mt9m001_video_probe(struct soc_camera_device *icd)
         case 0x8421:
                 mt9m001->model = V4L2_IDENT_MT9M001C12ST;
                 icd->formats = mt9m001_colour_formats;
-                if (mt9m001->client->dev.platform_data)
+                if (gpio_is_valid(icl->gpio))
                         icd->num_formats = ARRAY_SIZE(mt9m001_colour_formats);
                 else
                         icd->num_formats = 1;
@@ -608,7 +610,7 @@ static int mt9m001_video_probe(struct soc_camera_device *icd)
         case 0x8431:
                 mt9m001->model = V4L2_IDENT_MT9M001C12STM;
                 icd->formats = mt9m001_monochrome_formats;
-                if (mt9m001->client->dev.platform_data)
+                if (gpio_is_valid(icl->gpio))
                         icd->num_formats = ARRAY_SIZE(mt9m001_monochrome_formats);
                 else
                         icd->num_formats = 1;
@@ -640,8 +642,8 @@ static void mt9m001_video_remove(struct soc_camera_device *icd)
         struct mt9m001 *mt9m001 = container_of(icd, struct mt9m001, icd);
 
         dev_dbg(&icd->dev, "Video %x removed: %p, %p\n", mt9m001->client->addr,
-                mt9m001->icd.dev.parent, mt9m001->icd.vdev);
-        soc_camera_video_stop(&mt9m001->icd);
+                icd->dev.parent, icd->vdev);
+        soc_camera_video_stop(icd);
 }
 
 static int mt9m001_probe(struct i2c_client *client,