diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-03-28 07:18:37 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-05-19 11:57:52 -0400 |
commit | 037c75eb14cd6adb837f81f0c2b2a52c31c91e69 (patch) | |
tree | 79c54264c79256262f2d0079575ddcfcbb49f5c5 /drivers/media/video/videobuf-dma-sg.c | |
parent | a4cf4cac2979a828e7cd0a3cd02d7a5308a44a7f (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-sg.c')
-rw-r--r-- | drivers/media/video/videobuf-dma-sg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/videobuf-dma-sg.c b/drivers/media/video/videobuf-dma-sg.c index 014eb63c0960..43e78ee24a10 100644 --- a/drivers/media/video/videobuf-dma-sg.c +++ b/drivers/media/video/videobuf-dma-sg.c | |||
@@ -460,7 +460,7 @@ static struct videobuf_buffer *__videobuf_alloc(size_t size) | |||
460 | return vb; | 460 | return vb; |
461 | } | 461 | } |
462 | 462 | ||
463 | static void *__videobuf_to_vmalloc(struct videobuf_buffer *buf) | 463 | static void *__videobuf_to_vaddr(struct videobuf_buffer *buf) |
464 | { | 464 | { |
465 | struct videobuf_dma_sg_memory *mem = buf->priv; | 465 | struct videobuf_dma_sg_memory *mem = buf->priv; |
466 | BUG_ON(!mem); | 466 | BUG_ON(!mem); |
@@ -700,7 +700,7 @@ static struct videobuf_qtype_ops sg_ops = { | |||
700 | .mmap_mapper = __videobuf_mmap_mapper, | 700 | .mmap_mapper = __videobuf_mmap_mapper, |
701 | .video_copy_to_user = __videobuf_copy_to_user, | 701 | .video_copy_to_user = __videobuf_copy_to_user, |
702 | .copy_stream = __videobuf_copy_stream, | 702 | .copy_stream = __videobuf_copy_stream, |
703 | .vmalloc = __videobuf_to_vmalloc, | 703 | .vaddr = __videobuf_to_vaddr, |
704 | }; | 704 | }; |
705 | 705 | ||
706 | void *videobuf_sg_alloc(size_t size) | 706 | void *videobuf_sg_alloc(size_t size) |