diff options
author | Pawel Osciak <p.osciak@samsung.com> | 2010-05-11 09:36:28 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-08-02 14:20:47 -0400 |
commit | 33c38283f03d8ea0358229fc03c1beebe67aed0e (patch) | |
tree | 77cbda3006627840c754c56d02489c23a6ab348c /include | |
parent | c6cfe05532cf6e9858d60ee699c51b906842489d (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 'include')
-rw-r--r-- | include/media/videobuf-core.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/media/videobuf-core.h b/include/media/videobuf-core.h index f91a736c133d..a157cd166e6e 100644 --- a/include/media/videobuf-core.h +++ b/include/media/videobuf-core.h | |||
@@ -127,7 +127,7 @@ struct videobuf_queue_ops { | |||
127 | struct videobuf_qtype_ops { | 127 | struct videobuf_qtype_ops { |
128 | u32 magic; | 128 | u32 magic; |
129 | 129 | ||
130 | struct videobuf_buffer *(*alloc)(size_t size); | 130 | struct videobuf_buffer *(*alloc_vb)(size_t size); |
131 | void *(*vaddr) (struct videobuf_buffer *buf); | 131 | void *(*vaddr) (struct videobuf_buffer *buf); |
132 | int (*iolock) (struct videobuf_queue *q, | 132 | int (*iolock) (struct videobuf_queue *q, |
133 | struct videobuf_buffer *vb, | 133 | struct videobuf_buffer *vb, |
@@ -173,7 +173,7 @@ int videobuf_waiton(struct videobuf_buffer *vb, int non_blocking, int intr); | |||
173 | int videobuf_iolock(struct videobuf_queue *q, struct videobuf_buffer *vb, | 173 | int videobuf_iolock(struct videobuf_queue *q, struct videobuf_buffer *vb, |
174 | struct v4l2_framebuffer *fbuf); | 174 | struct v4l2_framebuffer *fbuf); |
175 | 175 | ||
176 | struct videobuf_buffer *videobuf_alloc(struct videobuf_queue *q); | 176 | struct videobuf_buffer *videobuf_alloc_vb(struct videobuf_queue *q); |
177 | 177 | ||
178 | /* Used on videobuf-dvb */ | 178 | /* Used on videobuf-dvb */ |
179 | void *videobuf_queue_to_vaddr(struct videobuf_queue *q, | 179 | void *videobuf_queue_to_vaddr(struct videobuf_queue *q, |