summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/videobuf-dma-contig.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-05-27 10:11:39 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-05-27 10:11:39 -0300
commite869f37a082df276cbc412d3f7da04fd3b41fed4 (patch)
treea4067ce193263515f64018aaec0d618fe5864e86 /linux/drivers/media/video/videobuf-dma-contig.c
parentfc06889a7cb90e50621ecaaf22f2f575b5ae6a44 (diff)
parentf8a7ff5ce3d73304b156a0ed39d309050c903a82 (diff)
downloadmediapointer-dvb-s2-e869f37a082df276cbc412d3f7da04fd3b41fed4.tar.gz
mediapointer-dvb-s2-e869f37a082df276cbc412d3f7da04fd3b41fed4.tar.bz2
merge: http://linuxtv.org/hg/~awalls/cx18-av-core
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/videobuf-dma-contig.c')
-rw-r--r--linux/drivers/media/video/videobuf-dma-contig.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/linux/drivers/media/video/videobuf-dma-contig.c b/linux/drivers/media/video/videobuf-dma-contig.c
index 6db1398fd..633a124cf 100644
--- a/linux/drivers/media/video/videobuf-dma-contig.c
+++ b/linux/drivers/media/video/videobuf-dma-contig.c
@@ -183,19 +183,6 @@ static int __videobuf_iolock(struct videobuf_queue *q,
return 0;
}
-static int __videobuf_sync(struct videobuf_queue *q,
- struct videobuf_buffer *buf)
-{
- struct videobuf_dma_contig_memory *mem = buf->priv;
-
- BUG_ON(!mem);
- MAGIC_CHECK(mem->magic, MAGIC_DC_MEM);
-
- dma_sync_single_for_cpu(q->dev, mem->dma_handle, mem->size,
- DMA_FROM_DEVICE);
- return 0;
-}
-
static int __videobuf_mmap_free(struct videobuf_queue *q)
{
unsigned int i;
@@ -357,7 +344,6 @@ static struct videobuf_qtype_ops qops = {
.alloc = __videobuf_alloc,
.iolock = __videobuf_iolock,
- .sync = __videobuf_sync,
.mmap_free = __videobuf_mmap_free,
.mmap_mapper = __videobuf_mmap_mapper,
.video_copy_to_user = __videobuf_copy_to_user,