[media] platform: Make use of media_bus_format enum

[deliverable/linux.git] / drivers / media / platform / soc_camera / mx3_camera.c

diff --git a/drivers/media/platform/soc_camera/mx3_camera.c b/drivers/media/platform/soc_camera/mx3_camera.c
index 83315dfeef6202b6fa9d4109a989020a035b9476..8e52ccce66deae21389d302c651e179c83c26a99 100644 (file)
--- a/drivers/media/platform/soc_camera/mx3_camera.c
+++ b/drivers/media/platform/soc_camera/mx3_camera.c
@@ -415,10 +415,8 @@ static void mx3_stop_streaming(struct vb2_queue *q)
        struct mx3_camera_buffer *buf, *tmp;
        unsigned long flags;
 
-       if (ichan) {
-               struct dma_chan *chan = &ichan->dma_chan;
-               chan->device->device_control(chan, DMA_PAUSE, 0);
-       }
+       if (ichan)
+               dmaengine_pause(&ichan->dma_chan);
 
        spin_lock_irqsave(&mx3_cam->lock, flags);
 
@@ -658,7 +656,7 @@ static int mx3_camera_get_formats(struct soc_camera_device *icd, unsigned int id
        struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
        struct device *dev = icd->parent;
        int formats = 0, ret;
-       enum v4l2_mbus_pixelcode code;
+       u32 code;
        const struct soc_mbus_pixelfmt *fmt;
 
        ret = v4l2_subdev_call(sd, video, enum_mbus_fmt, idx, &code);
@@ -679,7 +677,7 @@ static int mx3_camera_get_formats(struct soc_camera_device *icd, unsigned int id
                return 0;
 
        switch (code) {
-       case V4L2_MBUS_FMT_SBGGR10_1X10:
+       case MEDIA_BUS_FMT_SBGGR10_1X10:
                formats++;
                if (xlate) {
                        xlate->host_fmt = &mx3_camera_formats[0];
@@ -689,7 +687,7 @@ static int mx3_camera_get_formats(struct soc_camera_device *icd, unsigned int id
                                mx3_camera_formats[0].name, code);
                }
                break;
-       case V4L2_MBUS_FMT_Y10_1X10:
+       case MEDIA_BUS_FMT_Y10_1X10:
                formats++;
                if (xlate) {
                        xlate->host_fmt = &mx3_camera_formats[1];