aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/common/saa7146_vbi.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/common/saa7146_vbi.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/common/saa7146_vbi.c')
-rw-r--r--drivers/media/common/saa7146_vbi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/common/saa7146_vbi.c b/drivers/media/common/saa7146_vbi.c
index bfbd5a841ebf..74e2b56ecb5b 100644
--- a/drivers/media/common/saa7146_vbi.c
+++ b/drivers/media/common/saa7146_vbi.c
@@ -407,8 +407,8 @@ static int vbi_open(struct saa7146_dev *dev, struct file *file)
407 fh->vbi_fmt.start[1] = 312; 407 fh->vbi_fmt.start[1] = 312;
408 fh->vbi_fmt.count[1] = 16; 408 fh->vbi_fmt.count[1] = 16;
409 409
410 videobuf_queue_pci_init(&fh->vbi_q, &vbi_qops, 410 videobuf_queue_sg_init(&fh->vbi_q, &vbi_qops,
411 dev->pci, &dev->slock, 411 &dev->pci->dev, &dev->slock,
412 V4L2_BUF_TYPE_VBI_CAPTURE, 412 V4L2_BUF_TYPE_VBI_CAPTURE,
413 V4L2_FIELD_SEQ_TB, // FIXME: does this really work? 413 V4L2_FIELD_SEQ_TB, // FIXME: does this really work?
414 sizeof(struct saa7146_buf), 414 sizeof(struct saa7146_buf),