diff options
author | Guennadi Liakhovetski <g.liakhovetski@pengutronix.de> | 2008-04-22 13:42:13 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-24 13:07:44 -0400 |
commit | 0705135e59f8503e4dade4b3580fed77b1743b7c (patch) | |
tree | 9ab28abeff6cb8ffa50e565204ed4394524d28d7 /drivers/media/common/saa7146_video.c | |
parent | f13613acfb1a71895ac886dc831d6ae4e20e241a (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_video.c')
-rw-r--r-- | drivers/media/common/saa7146_video.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c index 66fdbd0e6a6d..3cbc6ebbe649 100644 --- a/drivers/media/common/saa7146_video.c +++ b/drivers/media/common/saa7146_video.c | |||
@@ -1410,8 +1410,8 @@ static int video_open(struct saa7146_dev *dev, struct file *file) | |||
1410 | sfmt = format_by_fourcc(dev,fh->video_fmt.pixelformat); | 1410 | sfmt = format_by_fourcc(dev,fh->video_fmt.pixelformat); |
1411 | fh->video_fmt.sizeimage = (fh->video_fmt.width * fh->video_fmt.height * sfmt->depth)/8; | 1411 | fh->video_fmt.sizeimage = (fh->video_fmt.width * fh->video_fmt.height * sfmt->depth)/8; |
1412 | 1412 | ||
1413 | videobuf_queue_pci_init(&fh->video_q, &video_qops, | 1413 | videobuf_queue_sg_init(&fh->video_q, &video_qops, |
1414 | dev->pci, &dev->slock, | 1414 | &dev->pci->dev, &dev->slock, |
1415 | V4L2_BUF_TYPE_VIDEO_CAPTURE, | 1415 | V4L2_BUF_TYPE_VIDEO_CAPTURE, |
1416 | V4L2_FIELD_INTERLACED, | 1416 | V4L2_FIELD_INTERLACED, |
1417 | sizeof(struct saa7146_buf), | 1417 | sizeof(struct saa7146_buf), |