Merge tag 'for-f2fs-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk...

[cascardo/linux.git] / drivers / media / pci / sta2x11 / sta2x11_vip.c

diff --git a/drivers/media/pci/sta2x11/sta2x11_vip.c b/drivers/media/pci/sta2x11/sta2x11_vip.c
index 1fc195f..aeb2b4e 100644 (file)
--- a/drivers/media/pci/sta2x11/sta2x11_vip.c
+++ b/drivers/media/pci/sta2x11/sta2x11_vip.c
@@ -111,7 +111,6 @@ static inline struct vip_buffer *to_vip_buffer(struct vb2_v4l2_buffer *vb2)
  * @input: input line for video signal ( 0 or 1 )
  * @disabled: Device is in power down state
  * @slock: for excluse acces of registers
- * @alloc_ctx: context for videobuf2
  * @vb_vidq: queue maintained by videobuf2 layer
  * @buffer_list: list of buffer in use
  * @sequence: sequence number of acquired buffer
@@ -141,7 +140,6 @@ struct sta2x11_vip {
        int disabled;
        spinlock_t slock;
 
-       struct vb2_alloc_ctx *alloc_ctx;
        struct vb2_queue vb_vidq;
        struct list_head buffer_list;
        unsigned int sequence;
@@ -267,7 +265,7 @@ static void vip_active_buf_next(struct sta2x11_vip *vip)
 /* Videobuf2 Operations */
 static int queue_setup(struct vb2_queue *vq,
                       unsigned int *nbuffers, unsigned int *nplanes,
-                      unsigned int sizes[], void *alloc_ctxs[])
+                      unsigned int sizes[], struct device *alloc_devs[])
 {
        struct sta2x11_vip *vip = vb2_get_drv_priv(vq);
 
@@ -276,7 +274,6 @@ static int queue_setup(struct vb2_queue *vq,
 
        *nplanes = 1;
        sizes[0] = vip->format.sizeimage;
-       alloc_ctxs[0] = vip->alloc_ctx;
 
        vip->sequence = 0;
        vip->active = NULL;
@@ -861,25 +858,15 @@ static int sta2x11_vip_init_buffer(struct sta2x11_vip *vip)
        vip->vb_vidq.ops = &vip_video_qops;
        vip->vb_vidq.mem_ops = &vb2_dma_contig_memops;
        vip->vb_vidq.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
+       vip->vb_vidq.dev = &vip->pdev->dev;
        err = vb2_queue_init(&vip->vb_vidq);
        if (err)
                return err;
        INIT_LIST_HEAD(&vip->buffer_list);
        spin_lock_init(&vip->lock);
-
-
-       vip->alloc_ctx = vb2_dma_contig_init_ctx(&vip->pdev->dev);
-       if (IS_ERR(vip->alloc_ctx)) {
-               v4l2_err(&vip->v4l2_dev, "Can't allocate buffer context");
-               return PTR_ERR(vip->alloc_ctx);
-       }
-
        return 0;
 }
-static void sta2x11_vip_release_buffer(struct sta2x11_vip *vip)
-{
-       vb2_dma_contig_cleanup_ctx(vip->alloc_ctx);
-}
+
 static int sta2x11_vip_init_controls(struct sta2x11_vip *vip)
 {
        /*
@@ -1120,7 +1107,6 @@ vrelease:
        video_unregister_device(&vip->video_dev);
        free_irq(pdev->irq, vip);
 release_buf:
-       sta2x11_vip_release_buffer(vip);
        pci_disable_msi(pdev);
 unmap:
        vb2_queue_release(&vip->vb_vidq);