diff options
author | Magnus Damm <damm@igel.co.jp> | 2009-04-28 04:45:39 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-16 17:20:57 -0400 |
commit | c9adb4314f0cd2be9304cef8342d71464becb40e (patch) | |
tree | bd914f36b6e5863ddb481de993fba9fb3748caa5 | |
parent | 6e9c1a2a6766df0cad1632812c6ad05eabf158e4 (diff) |
V4L/DVB (11731): buf-dma-contig: remove sync operation
Remove the videobuf-dma-contig sync operation. Sync is only needed
for noncoherent buffers, and since videobuf-dma-contig is built on
coherent memory allocators the memory is by definition always in sync.
Reported-by: Matthieu CASTET <matthieu.castet@parrot.com>
Signed-off-by: Magnus Damm <damm@igel.co.jp>
Reviewed-by: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/video/videobuf-dma-contig.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/media/video/videobuf-dma-contig.c b/drivers/media/video/videobuf-dma-contig.c index 6109fb5f34e2..08d3e17c450a 100644 --- a/drivers/media/video/videobuf-dma-contig.c +++ b/drivers/media/video/videobuf-dma-contig.c | |||
@@ -182,19 +182,6 @@ static int __videobuf_iolock(struct videobuf_queue *q, | |||
182 | return 0; | 182 | return 0; |
183 | } | 183 | } |
184 | 184 | ||
185 | static int __videobuf_sync(struct videobuf_queue *q, | ||
186 | struct videobuf_buffer *buf) | ||
187 | { | ||
188 | struct videobuf_dma_contig_memory *mem = buf->priv; | ||
189 | |||
190 | BUG_ON(!mem); | ||
191 | MAGIC_CHECK(mem->magic, MAGIC_DC_MEM); | ||
192 | |||
193 | dma_sync_single_for_cpu(q->dev, mem->dma_handle, mem->size, | ||
194 | DMA_FROM_DEVICE); | ||
195 | return 0; | ||
196 | } | ||
197 | |||
198 | static int __videobuf_mmap_free(struct videobuf_queue *q) | 185 | static int __videobuf_mmap_free(struct videobuf_queue *q) |
199 | { | 186 | { |
200 | unsigned int i; | 187 | unsigned int i; |
@@ -356,7 +343,6 @@ static struct videobuf_qtype_ops qops = { | |||
356 | 343 | ||
357 | .alloc = __videobuf_alloc, | 344 | .alloc = __videobuf_alloc, |
358 | .iolock = __videobuf_iolock, | 345 | .iolock = __videobuf_iolock, |
359 | .sync = __videobuf_sync, | ||
360 | .mmap_free = __videobuf_mmap_free, | 346 | .mmap_free = __videobuf_mmap_free, |
361 | .mmap_mapper = __videobuf_mmap_mapper, | 347 | .mmap_mapper = __videobuf_mmap_mapper, |
362 | .video_copy_to_user = __videobuf_copy_to_user, | 348 | .video_copy_to_user = __videobuf_copy_to_user, |