diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-02-25 00:48:54 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-02-25 00:48:54 -0300 |
| commit | 23d271bea2b77095cc79f0c7356d7e1131bcaeae (patch) | |
| tree | 9587618e84489f1d0cbe7263bfaa674ea18e30a5 /linux/drivers/media/common | |
| parent | 4e45e0172add32a7af042e418add1d2f1e4ae5a4 (diff) | |
| download | mediapointer-dvb-s2-23d271bea2b77095cc79f0c7356d7e1131bcaeae.tar.gz mediapointer-dvb-s2-23d271bea2b77095cc79f0c7356d7e1131bcaeae.tar.bz2 | |
From: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de>
Subject: Convert videobuf-dma-sg to generic DMA API
Date: Tue, 19 Feb 2008 13:40:54 +0100 (CET)
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 'linux/drivers/media/common')
| -rw-r--r-- | linux/drivers/media/common/saa7146_vbi.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/common/saa7146_video.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/common/saa7146_vbi.c b/linux/drivers/media/common/saa7146_vbi.c index 50cb69e9d..9a03df7fc 100644 --- a/linux/drivers/media/common/saa7146_vbi.c +++ b/linux/drivers/media/common/saa7146_vbi.c @@ -408,8 +408,8 @@ static int vbi_open(struct saa7146_dev *dev, struct file *file) fh->vbi_fmt.start[1] = 312; fh->vbi_fmt.count[1] = 16; - videobuf_queue_pci_init(&fh->vbi_q, &vbi_qops, - dev->pci, &dev->slock, + videobuf_queue_sg_init(&fh->vbi_q, &vbi_qops, + &dev->pci->dev, &dev->slock, V4L2_BUF_TYPE_VBI_CAPTURE, V4L2_FIELD_SEQ_TB, // FIXME: does this really work? sizeof(struct saa7146_buf), diff --git a/linux/drivers/media/common/saa7146_video.c b/linux/drivers/media/common/saa7146_video.c index 027d62c04..b68c6288b 100644 --- a/linux/drivers/media/common/saa7146_video.c +++ b/linux/drivers/media/common/saa7146_video.c @@ -1411,8 +1411,8 @@ static int video_open(struct saa7146_dev *dev, struct file *file) sfmt = format_by_fourcc(dev,fh->video_fmt.pixelformat); fh->video_fmt.sizeimage = (fh->video_fmt.width * fh->video_fmt.height * sfmt->depth)/8; - videobuf_queue_pci_init(&fh->video_q, &video_qops, - dev->pci, &dev->slock, + videobuf_queue_sg_init(&fh->video_q, &video_qops, + &dev->pci->dev, &dev->slock, V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_INTERLACED, sizeof(struct saa7146_buf), |