aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/videobuf-dma-contig.c
diff options
context:
space:
mode:
authorPawel Osciak <p.osciak@samsung.com>2010-05-11 09:36:28 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-08-02 14:20:47 -0400
commit33c38283f03d8ea0358229fc03c1beebe67aed0e (patch)
tree77cbda3006627840c754c56d02489c23a6ab348c /drivers/media/video/videobuf-dma-contig.c
parentc6cfe05532cf6e9858d60ee699c51b906842489d (diff)
V4L/DVB: videobuf: rename videobuf_alloc to videobuf_alloc_vb
These functions allocate videobuf_buffer structures only. Renaming in order to prevent confusion with functions allocating actual video buffer memory. Rename the functions in videobuf-core.h videobuf-dma-sg.c as well. Signed-off-by: Pawel Osciak <p.osciak@samsung.com> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> 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 74730c624cfc..98e292c35185 100644
--- a/drivers/media/video/videobuf-dma-contig.c
+++ b/drivers/media/video/videobuf-dma-contig.c
@@ -190,7 +190,7 @@ static int videobuf_dma_contig_user_get(struct videobuf_dma_contig_memory *mem,
190 return ret; 190 return ret;
191} 191}
192 192
193static struct videobuf_buffer *__videobuf_alloc(size_t size) 193static struct videobuf_buffer *__videobuf_alloc_vb(size_t size)
194{ 194{
195 struct videobuf_dma_contig_memory *mem; 195 struct videobuf_dma_contig_memory *mem;
196 struct videobuf_buffer *vb; 196 struct videobuf_buffer *vb;
@@ -338,7 +338,7 @@ error:
338static struct videobuf_qtype_ops qops = { 338static struct videobuf_qtype_ops qops = {
339 .magic = MAGIC_QTYPE_OPS, 339 .magic = MAGIC_QTYPE_OPS,
340 340
341 .alloc = __videobuf_alloc, 341 .alloc_vb = __videobuf_alloc_vb,
342 .iolock = __videobuf_iolock, 342 .iolock = __videobuf_iolock,
343 .mmap_mapper = __videobuf_mmap_mapper, 343 .mmap_mapper = __videobuf_mmap_mapper,
344 .vaddr = __videobuf_to_vaddr, 344 .vaddr = __videobuf_to_vaddr,