V4L/DVB (7237): Convert videobuf-dma-sg to generic DMA API

videobuf-dma-sg does not need to depend on PCI. Switch it to using generic
DMA API, convert all affected drivers, relax Kconfig restriction, improve
compile-time type checking, fix some Coding Style violations while at it.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c
index 505bc0a478af..048081be91fe 100644
--- a/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/drivers/media/video/saa7134/saa7134-alsa.c
@@ -503,7 +503,7 @@ static int snd_card_saa7134_hw_params(struct snd_pcm_substream * substream,
         /* release the old buffer */
         if (substream->runtime->dma_area) {
                 saa7134_pgtable_free(dev->pci, &dev->dmasound.pt);
-                videobuf_pci_dma_unmap(dev->pci, &dev->dmasound.dma);
+                videobuf_sg_dma_unmap(&dev->pci->dev, &dev->dmasound.dma);
                 dsp_buffer_free(dev);
                 substream->runtime->dma_area = NULL;
         }
@@ -519,12 +519,12 @@ static int snd_card_saa7134_hw_params(struct snd_pcm_substream * substream,
                 return err;
         }
 
-        if (0 != (err = videobuf_pci_dma_map(dev->pci, &dev->dmasound.dma))) {
+        if (0 != (err = videobuf_sg_dma_map(&dev->pci->dev, &dev->dmasound.dma))) {
                 dsp_buffer_free(dev);
                 return err;
         }
         if (0 != (err = saa7134_pgtable_alloc(dev->pci,&dev->dmasound.pt))) {
-                videobuf_pci_dma_unmap(dev->pci, &dev->dmasound.dma);
+                videobuf_sg_dma_unmap(&dev->pci->dev, &dev->dmasound.dma);
                 dsp_buffer_free(dev);
                 return err;
         }
@@ -533,7 +533,7 @@ static int snd_card_saa7134_hw_params(struct snd_pcm_substream * substream,
                                                 dev->dmasound.dma.sglen,
                                                 0))) {
                 saa7134_pgtable_free(dev->pci, &dev->dmasound.pt);
-                videobuf_pci_dma_unmap(dev->pci, &dev->dmasound.dma);
+                videobuf_sg_dma_unmap(&dev->pci->dev, &dev->dmasound.dma);
                 dsp_buffer_free(dev);
                 return err;
         }
@@ -569,7 +569,7 @@ static int snd_card_saa7134_hw_free(struct snd_pcm_substream * substream)
 
         if (substream->runtime->dma_area) {
                 saa7134_pgtable_free(dev->pci, &dev->dmasound.pt);
-                videobuf_pci_dma_unmap(dev->pci, &dev->dmasound.dma);
+                videobuf_sg_dma_unmap(&dev->pci->dev, &dev->dmasound.dma);
                 dsp_buffer_free(dev);
                 substream->runtime->dma_area = NULL;
         }