aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/videobuf-dma-contig.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2010-03-28 07:18:37 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-19 11:57:52 -0400
commit037c75eb14cd6adb837f81f0c2b2a52c31c91e69 (patch)
tree79c54264c79256262f2d0079575ddcfcbb49f5c5 /drivers/media/video/videobuf-dma-contig.c
parenta4cf4cac2979a828e7cd0a3cd02d7a5308a44a7f (diff)
V4L/DVB: v4l videobuf: rename .vmalloc to .vaddr
Rename the .vmalloc op in struct videobuf_qtype_ops to .vaddr. This op returns the virtual kernel address of a buffer. vaddr is a lot less confusing than vmalloc since this callback does do any allocations. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/videobuf-dma-contig.c')
-rw-r--r--drivers/media/video/videobuf-dma-contig.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/videobuf-dma-contig.c b/drivers/media/video/videobuf-dma-contig.c
index 76e158feca61..7226ca47cbf5 100644
--- a/drivers/media/video/videobuf-dma-contig.c
+++ b/drivers/media/video/videobuf-dma-contig.c
@@ -204,7 +204,7 @@ static struct videobuf_buffer *__videobuf_alloc(size_t size)
204 return vb; 204 return vb;
205} 205}
206 206
207static void *__videobuf_to_vmalloc(struct videobuf_buffer *buf) 207static void *__videobuf_to_vaddr(struct videobuf_buffer *buf)
208{ 208{
209 struct videobuf_dma_contig_memory *mem = buf->priv; 209 struct videobuf_dma_contig_memory *mem = buf->priv;
210 210
@@ -414,7 +414,7 @@ static struct videobuf_qtype_ops qops = {
414 .mmap_mapper = __videobuf_mmap_mapper, 414 .mmap_mapper = __videobuf_mmap_mapper,
415 .video_copy_to_user = __videobuf_copy_to_user, 415 .video_copy_to_user = __videobuf_copy_to_user,
416 .copy_stream = __videobuf_copy_stream, 416 .copy_stream = __videobuf_copy_stream,
417 .vmalloc = __videobuf_to_vmalloc, 417 .vaddr = __videobuf_to_vaddr,
418}; 418};
419 419
420void videobuf_queue_dma_contig_init(struct videobuf_queue *q, 420void videobuf_queue_dma_contig_init(struct videobuf_queue *q,