V4L/DVB: videobuf: Remove the videobuf_sg_dma_map/unmap functions

Instead of creating dirty wrappers around videobuf_dma_map/unmap that
create a dummy videobuf_queue structure, modify videobuf_dma_map/unmap
to take a device pointer argument and use it directly. The
videobuf_sg_dma_map/unmap then become unused and can be removed.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

2 files changed, 3 insertions, 3 deletions

diff --git a/drivers/media/video/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c
index 33082c96745..07fe905f657 100644
--- a/drivers/media/video/cx88/cx88-alsa.c
+++ b/drivers/media/video/cx88/cx88-alsa.c
@@ -283,7 +283,7 @@ static int dsp_buffer_free(snd_cx88_card_t *chip)
         BUG_ON(!chip->dma_size);
 
         dprintk(2,"Freeing buffer\n");
-        videobuf_sg_dma_unmap(&chip->pci->dev, chip->dma_risc);
+        videobuf_dma_unmap(&chip->pci->dev, chip->dma_risc);
         videobuf_dma_free(chip->dma_risc);
         btcx_riscmem_free(chip->pci,&chip->buf->risc);
         kfree(chip->buf);
@@ -409,7 +409,7 @@ static int snd_cx88_hw_params(struct snd_pcm_substream * substream,
         if (ret < 0)
                 goto error;
 
-        ret = videobuf_sg_dma_map(&chip->pci->dev, dma);
+        ret = videobuf_dma_map(&chip->pci->dev, dma);
         if (ret < 0)
                 goto error;
 
diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c
index 8b21457111b..85eb266fb35 100644
--- a/drivers/media/video/cx88/cx88-core.c
+++ b/drivers/media/video/cx88/cx88-core.c
@@ -218,7 +218,7 @@ cx88_free_buffer(struct videobuf_queue *q, struct cx88_buffer *buf)
 
         BUG_ON(in_interrupt());
         videobuf_waiton(&buf->vb,0,0);
-        videobuf_dma_unmap(q, dma);
+        videobuf_dma_unmap(q->dev, dma);
         videobuf_dma_free(dma);
         btcx_riscmem_free(to_pci_dev(q->dev), &buf->risc);
         buf->vb.state = VIDEOBUF_NEEDS_INIT;