leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[media] vb2: Rename confusingly named internal buffer preparation functions

Browse Source 
Rename __qbuf_*() functions which are specific to a buffer type as
__prepare_*() which matches with what they do. The naming was there for
historical reasons; the purpose of the functions was changed without
renaming them.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Sakari Ailus 2017-05-31 11:17:25 -03:00 committed by Mauro Carvalho Chehab
parent acc490bbb7
commit 6aca5b8fb8
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/media/v4l2-core/videobuf2-core.c
View File

@ -956,9 +956,9 @@ void vb2_discard_done(struct vb2_queue *q)
EXPORT_SYMBOL_GPL(vb2_discard_done);
/**
* __qbuf_mmap() - handle qbuf of an MMAP buffer
* __prepare_mmap() - prepare an MMAP buffer
*/
static int __qbuf_mmap(struct vb2_buffer *vb, const void *pb)
static int __prepare_mmap(struct vb2_buffer *vb, const void *pb)
{
int ret = 0;
@ -969,9 +969,9 @@ static int __qbuf_mmap(struct vb2_buffer *vb, const void *pb)
}
/**
* __qbuf_userptr() - handle qbuf of a USERPTR buffer
* __prepare_userptr() - prepare a USERPTR buffer
*/
static int __qbuf_userptr(struct vb2_buffer *vb, const void *pb)
static int __prepare_userptr(struct vb2_buffer *vb, const void *pb)
{
struct vb2_plane planes[VB2_MAX_PLANES];
struct vb2_queue *q = vb->vb2_queue;
@ -1087,9 +1087,9 @@ err:
}
/**
* __qbuf_dmabuf() - handle qbuf of a DMABUF buffer
* __prepare_dmabuf() - prepare a DMABUF buffer
*/
static int __qbuf_dmabuf(struct vb2_buffer *vb, const void *pb)
static int __prepare_dmabuf(struct vb2_buffer *vb, const void *pb)
{
struct vb2_plane planes[VB2_MAX_PLANES];
struct vb2_queue *q = vb->vb2_queue;
@ -1255,13 +1255,13 @@ static int __buf_prepare(struct vb2_buffer *vb, const void *pb)
switch (q->memory) {
case VB2_MEMORY_MMAP:
ret = __qbuf_mmap(vb, pb);
ret = __prepare_mmap(vb, pb);
break;
case VB2_MEMORY_USERPTR:
ret = __qbuf_userptr(vb, pb);
ret = __prepare_userptr(vb, pb);
break;
case VB2_MEMORY_DMABUF:
ret = __qbuf_dmabuf(vb, pb);
ret = __prepare_dmabuf(vb, pb);
break;
default:
WARN(1, "Invalid queue type\n");