aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7134/saa7134-video.c
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@pengutronix.de>2008-04-22 13:42:13 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-04-24 13:07:44 -0400
commit0705135e59f8503e4dade4b3580fed77b1743b7c (patch)
tree9ab28abeff6cb8ffa50e565204ed4394524d28d7 /drivers/media/video/saa7134/saa7134-video.c
parentf13613acfb1a71895ac886dc831d6ae4e20e241a (diff)
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>
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-video.c')
-rw-r--r--drivers/media/video/saa7134/saa7134-video.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c
index 5385026a85e..ecc5243da57 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)
1350 fh->height = 576; 1350 fh->height = 576;
1351 v4l2_prio_open(&dev->prio,&fh->prio); 1351 v4l2_prio_open(&dev->prio,&fh->prio);
1352 1352
1353 videobuf_queue_pci_init(&fh->cap, &video_qops, 1353 videobuf_queue_sg_init(&fh->cap, &video_qops,
1354 dev->pci, &dev->slock, 1354 &dev->pci->dev, &dev->slock,
1355 V4L2_BUF_TYPE_VIDEO_CAPTURE, 1355 V4L2_BUF_TYPE_VIDEO_CAPTURE,
1356 V4L2_FIELD_INTERLACED, 1356 V4L2_FIELD_INTERLACED,
1357 sizeof(struct saa7134_buf), 1357 sizeof(struct saa7134_buf),
1358 fh); 1358 fh);
1359 videobuf_queue_pci_init(&fh->vbi, &saa7134_vbi_qops, 1359 videobuf_queue_sg_init(&fh->vbi, &saa7134_vbi_qops,
1360 dev->pci, &dev->slock, 1360 &dev->pci->dev, &dev->slock,
1361 V4L2_BUF_TYPE_VBI_CAPTURE, 1361 V4L2_BUF_TYPE_VBI_CAPTURE,
1362 V4L2_FIELD_SEQ_TB, 1362 V4L2_FIELD_SEQ_TB,
1363 sizeof(struct saa7134_buf), 1363 sizeof(struct saa7134_buf),