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>

4 files changed, 13 insertions, 13 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;
         }
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c
index b55df4877aff..eabc67d03b2c 100644
--- a/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/drivers/media/video/saa7134/saa7134-dvb.c
@@ -899,8 +899,8 @@ static int dvb_init(struct saa7134_dev *dev)
         dev->ts.nr_bufs    = 32;
         dev->ts.nr_packets = 32*4;
         dev->dvb.name = dev->name;
-        videobuf_queue_pci_init(&dev->dvb.dvbq, &saa7134_ts_qops,
-                            dev->pci, &dev->slock,
+        videobuf_queue_sg_init(&dev->dvb.dvbq, &saa7134_ts_qops,
+                            &dev->pci->dev, &dev->slock,
                             V4L2_BUF_TYPE_VIDEO_CAPTURE,
                             V4L2_FIELD_ALTERNATE,
                             sizeof(struct saa7134_buf),
diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c
index 40d4a66b77f5..e002be568c21 100644
--- a/drivers/media/video/saa7134/saa7134-empress.c
+++ b/drivers/media/video/saa7134/saa7134-empress.c
@@ -427,8 +427,8 @@ static int empress_init(struct saa7134_dev *dev)
         printk(KERN_INFO "%s: registered device video%d [mpeg]\n",
                dev->name,dev->empress_dev->minor & 0x1f);
 
-        videobuf_queue_pci_init(&dev->empress_tsq, &saa7134_ts_qops,
-                            dev->pci, &dev->slock,
+        videobuf_queue_sg_init(&dev->empress_tsq, &saa7134_ts_qops,
+                            &dev->pci->dev, &dev->slock,
                             V4L2_BUF_TYPE_VIDEO_CAPTURE,
                             V4L2_FIELD_ALTERNATE,
                             sizeof(struct saa7134_buf),
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c
index 5385026a85ef..ecc5243da57e 100644
--- a/drivers/media/video/saa7134/saa7134-video.c
+++ b/drivers/media/video/saa7134/saa7134-video.c
@@ -1350,14 +1350,14 @@ static int video_open(struct inode *inode, struct file *file)
         fh->height   = 576;
         v4l2_prio_open(&dev->prio,&fh->prio);
 
-        videobuf_queue_pci_init(&fh->cap, &video_qops,
-                            dev->pci, &dev->slock,
+        videobuf_queue_sg_init(&fh->cap, &video_qops,
+                            &dev->pci->dev, &dev->slock,
                             V4L2_BUF_TYPE_VIDEO_CAPTURE,
                             V4L2_FIELD_INTERLACED,
                             sizeof(struct saa7134_buf),
                             fh);
-        videobuf_queue_pci_init(&fh->vbi, &saa7134_vbi_qops,
-                            dev->pci, &dev->slock,
+        videobuf_queue_sg_init(&fh->vbi, &saa7134_vbi_qops,
+                            &dev->pci->dev, &dev->slock,
                             V4L2_BUF_TYPE_VBI_CAPTURE,
                             V4L2_FIELD_SEQ_TB,
                             sizeof(struct saa7134_buf),