[media] media/pci: convert drivers to use the new vb2_queue dev field

[sfrench/cifs-2.6.git] / drivers / media / pci / cx88 / cx88-mpeg.c

diff --git a/drivers/media/pci/cx88/cx88-mpeg.c b/drivers/media/pci/cx88/cx88-mpeg.c
index f34c229f9b374d3dedd424bb54bc2119b0ee0607..245357adbc250ea117540ad62d5828aa0da240dd 100644 (file)
--- a/drivers/media/pci/cx88/cx88-mpeg.c
+++ b/drivers/media/pci/cx88/cx88-mpeg.c
@@ -726,11 +726,6 @@ static int cx8802_probe(struct pci_dev *pci_dev,
        if (NULL == dev)
                goto fail_core;
        dev->pci = pci_dev;
-       dev->alloc_ctx = vb2_dma_sg_init_ctx(&pci_dev->dev);
-       if (IS_ERR(dev->alloc_ctx)) {
-               err = PTR_ERR(dev->alloc_ctx);
-               goto fail_dev;
-       }
        dev->core = core;
 
        /* Maintain a reference so cx88-video can query the 8802 device. */
@@ -738,7 +733,7 @@ static int cx8802_probe(struct pci_dev *pci_dev,
 
        err = cx8802_init_common(dev);
        if (err != 0)
-               goto fail_free;
+               goto fail_dev;
 
        INIT_LIST_HEAD(&dev->drvlist);
        mutex_lock(&cx8802_mutex);
@@ -749,8 +744,6 @@ static int cx8802_probe(struct pci_dev *pci_dev,
        request_modules(dev);
        return 0;
 
- fail_free:
-       vb2_dma_sg_cleanup_ctx(dev->alloc_ctx);
  fail_dev:
        kfree(dev);
  fail_core:
@@ -798,7 +791,6 @@ static void cx8802_remove(struct pci_dev *pci_dev)
        /* common */
        cx8802_fini_common(dev);
        cx88_core_put(dev->core,dev->pci);
-       vb2_dma_sg_cleanup_ctx(dev->alloc_ctx);
        kfree(dev);
 }