1 files changed, 20 insertions, 34 deletions

diff --git a/drivers/media/video/mx3_camera.c b/drivers/media/video/mx3_camera.c
index 2edf77a6256b..677d355be8fc 100644
--- a/drivers/media/video/mx3_camera.c
+++ b/drivers/media/video/mx3_camera.c
@@ -431,7 +431,7 @@ static void mx3_camera_init_videobuf(struct videobuf_queue *q,
         struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
         struct mx3_camera_dev *mx3_cam = ici->priv;
 
-        videobuf_queue_dma_contig_init(q, &mx3_videobuf_ops, ici->dev,
+        videobuf_queue_dma_contig_init(q, &mx3_videobuf_ops, icd->dev.parent,
                                        &mx3_cam->lock,
                                        V4L2_BUF_TYPE_VIDEO_CAPTURE,
                                        V4L2_FIELD_NONE,
@@ -494,17 +494,11 @@ static int mx3_camera_add_device(struct soc_camera_device *icd)
 {
         struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
         struct mx3_camera_dev *mx3_cam = ici->priv;
-        int ret;
 
-        if (mx3_cam->icd) {
-                ret = -EBUSY;
-                goto ebusy;
-        }
+        if (mx3_cam->icd)
+                return -EBUSY;
 
         mx3_camera_activate(mx3_cam, icd);
-        ret = icd->ops->init(icd);
-        if (ret < 0)
-                goto einit;
 
         mx3_cam->icd = icd;
 
@@ -512,12 +506,6 @@ static int mx3_camera_add_device(struct soc_camera_device *icd)
                  icd->devnum);
 
         return 0;
-
-einit:
-        clk_disable(mx3_cam->clk);
-ebusy:
-
-        return ret;
 }
 
 /* Called with .video_lock held */
@@ -534,8 +522,6 @@ static void mx3_camera_remove_device(struct soc_camera_device *icd)
                 *ichan = NULL;
         }
 
-        icd->ops->release(icd);
-
         clk_disable(mx3_cam->clk);
 
         mx3_cam->icd = NULL;
@@ -600,7 +586,7 @@ static int test_platform_param(struct mx3_camera_dev *mx3_cam,
                 *flags |= SOCAM_DATAWIDTH_4;
                 break;
         default:
-                dev_info(mx3_cam->soc_host.dev, "Unsupported bus width %d\n",
+                dev_info(mx3_cam->soc_host.v4l2_dev.dev, "Unsupported bus width %d\n",
                          buswidth);
                 return -EINVAL;
         }
@@ -616,7 +602,7 @@ static int mx3_camera_try_bus_param(struct soc_camera_device *icd,
         unsigned long bus_flags, camera_flags;
         int ret = test_platform_param(mx3_cam, depth, &bus_flags);
 
-        dev_dbg(ici->dev, "requested bus width %d bit: %d\n", depth, ret);
+        dev_dbg(icd->dev.parent, "requested bus width %d bit: %d\n", depth, ret);
 
         if (ret < 0)
                 return ret;
@@ -639,7 +625,7 @@ static bool chan_filter(struct dma_chan *chan, void *arg)
         if (!rq)
                 return false;
 
-        pdata = rq->mx3_cam->soc_host.dev->platform_data;
+        pdata = rq->mx3_cam->soc_host.v4l2_dev.dev->platform_data;
 
         return rq->id == chan->chan_id &&
                 pdata->dma_dev == chan->device->dev;
@@ -699,7 +685,7 @@ static int mx3_camera_get_formats(struct soc_camera_device *icd, int idx,
                         xlate->cam_fmt = icd->formats + idx;
                         xlate->buswidth = buswidth;
                         xlate++;
-                        dev_dbg(ici->dev, "Providing format %s using %s\n",
+                        dev_dbg(icd->dev.parent, "Providing format %s using %s\n",
                                 mx3_camera_formats[0].name,
                                 icd->formats[idx].name);
                 }
@@ -711,7 +697,7 @@ static int mx3_camera_get_formats(struct soc_camera_device *icd, int idx,
                         xlate->cam_fmt = icd->formats + idx;
                         xlate->buswidth = buswidth;
                         xlate++;
-                        dev_dbg(ici->dev, "Providing format %s using %s\n",
+                        dev_dbg(icd->dev.parent, "Providing format %s using %s\n",
                                 mx3_camera_formats[0].name,
                                 icd->formats[idx].name);
                 }
@@ -724,7 +710,7 @@ passthrough:
                         xlate->cam_fmt = icd->formats + idx;
                         xlate->buswidth = buswidth;
                         xlate++;
-                        dev_dbg(ici->dev,
+                        dev_dbg(icd->dev.parent,
                                 "Providing format %s in pass-through mode\n",
                                 icd->formats[idx].name);
                 }
@@ -831,7 +817,7 @@ static int mx3_camera_set_fmt(struct soc_camera_device *icd,
 
         xlate = soc_camera_xlate_by_fourcc(icd, pix->pixelformat);
         if (!xlate) {
-                dev_warn(ici->dev, "Format %x not found\n", pix->pixelformat);
+                dev_warn(icd->dev.parent, "Format %x not found\n", pix->pixelformat);
                 return -EINVAL;
         }
 
@@ -847,7 +833,7 @@ static int mx3_camera_set_fmt(struct soc_camera_device *icd,
 
         configure_geometry(mx3_cam, &rect);
 
-        ret = icd->ops->set_fmt(icd, f);
+        ret = v4l2_device_call_until_err(&ici->v4l2_dev, 0, video, s_fmt, f);
         if (!ret) {
                 icd->buswidth = xlate->buswidth;
                 icd->current_fmt = xlate->host_fmt;
@@ -868,7 +854,7 @@ static int mx3_camera_try_fmt(struct soc_camera_device *icd,
 
         xlate = soc_camera_xlate_by_fourcc(icd, pixfmt);
         if (pixfmt && !xlate) {
-                dev_warn(ici->dev, "Format %x not found\n", pixfmt);
+                dev_warn(icd->dev.parent, "Format %x not found\n", pixfmt);
                 return -EINVAL;
         }
 
@@ -885,7 +871,7 @@ static int mx3_camera_try_fmt(struct soc_camera_device *icd,
         /* camera has to see its format, but the user the original one */
         pix->pixelformat = xlate->cam_fmt->fourcc;
         /* limit to sensor capabilities */
-        ret = icd->ops->try_fmt(icd, f);
+        ret = v4l2_device_call_until_err(&ici->v4l2_dev, 0, video, try_fmt, f);
         pix->pixelformat = xlate->host_fmt->fourcc;
 
         field = pix->field;
@@ -935,11 +921,11 @@ static int mx3_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt)
 
         xlate = soc_camera_xlate_by_fourcc(icd, pixfmt);
         if (!xlate) {
-                dev_warn(ici->dev, "Format %x not found\n", pixfmt);
+                dev_warn(icd->dev.parent, "Format %x not found\n", pixfmt);
                 return -EINVAL;
         }
 
-        dev_dbg(ici->dev, "requested bus width %d bit: %d\n",
+        dev_dbg(icd->dev.parent, "requested bus width %d bit: %d\n",
                 icd->buswidth, ret);
 
         if (ret < 0)
@@ -948,10 +934,10 @@ static int mx3_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt)
         camera_flags = icd->ops->query_bus_param(icd);
 
         common_flags = soc_camera_bus_param_compatible(camera_flags, bus_flags);
-        dev_dbg(ici->dev, "Flags cam: 0x%lx host: 0x%lx common: 0x%lx\n",
+        dev_dbg(icd->dev.parent, "Flags cam: 0x%lx host: 0x%lx common: 0x%lx\n",
                 camera_flags, bus_flags, common_flags);
         if (!common_flags) {
-                dev_dbg(ici->dev, "no common flags");
+                dev_dbg(icd->dev.parent, "no common flags");
                 return -EINVAL;
         }
 
@@ -1005,7 +991,7 @@ static int mx3_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt)
 
         ret = icd->ops->set_bus_param(icd, common_flags);
         if (ret < 0) {
-                dev_dbg(ici->dev, "camera set_bus_param(%lx) returned %d\n",
+                dev_dbg(icd->dev.parent, "camera set_bus_param(%lx) returned %d\n",
                         common_flags, ret);
                 return ret;
         }
@@ -1060,7 +1046,7 @@ static int mx3_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt)
 
         csi_reg_write(mx3_cam, sens_conf | dw, CSI_SENS_CONF);
 
-        dev_dbg(ici->dev, "Set SENS_CONF to %x\n", sens_conf | dw);
+        dev_dbg(icd->dev.parent, "Set SENS_CONF to %x\n", sens_conf | dw);
 
         return 0;
 }
@@ -1145,7 +1131,7 @@ static int __devinit mx3_camera_probe(struct platform_device *pdev)
         soc_host->drv_name      = MX3_CAM_DRV_NAME;
         soc_host->ops           = &mx3_soc_camera_host_ops;
         soc_host->priv          = mx3_cam;
-        soc_host->dev           = &pdev->dev;
+        soc_host->v4l2_dev.dev  = &pdev->dev;
         soc_host->nr            = pdev->id;
 
         err = soc_camera_host_register(soc_host);