| Message ID | 1441972234-8643-2-git-send-email-sakari.ailus@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 09/11/2015 01:50 PM, Sakari Ailus wrote: > 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> Good one! Hans > --- > drivers/media/v4l2-core/videobuf2-core.c | 19 ++++++++++--------- > 1 file changed, 10 insertions(+), 9 deletions(-) > > diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c > index b866a6b..af6a23a 100644 > --- a/drivers/media/v4l2-core/videobuf2-core.c > +++ b/drivers/media/v4l2-core/videobuf2-core.c > @@ -1391,18 +1391,19 @@ static void __fill_vb2_buffer(struct vb2_buffer *vb, const struct v4l2_buffer *b > } > > /** > - * __qbuf_mmap() - handle qbuf of an MMAP buffer > + * __prepare_mmap() - prepare an MMAP buffer > */ > -static int __qbuf_mmap(struct vb2_buffer *vb, const struct v4l2_buffer *b) > +static int __prepare_mmap(struct vb2_buffer *vb, const struct v4l2_buffer *b) > { > __fill_vb2_buffer(vb, b, vb->v4l2_planes); > return call_vb_qop(vb, buf_prepare, vb); > } > > /** > - * __qbuf_userptr() - handle qbuf of a USERPTR buffer > + * __prepare_userptr() - prepare a USERPTR buffer > */ > -static int __qbuf_userptr(struct vb2_buffer *vb, const struct v4l2_buffer *b) > +static int __prepare_userptr(struct vb2_buffer *vb, > + const struct v4l2_buffer *b) > { > struct v4l2_plane planes[VIDEO_MAX_PLANES]; > struct vb2_queue *q = vb->vb2_queue; > @@ -1504,9 +1505,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 struct v4l2_buffer *b) > +static int __prepare_dmabuf(struct vb2_buffer *vb, const struct v4l2_buffer *b) > { > struct v4l2_plane planes[VIDEO_MAX_PLANES]; > struct vb2_queue *q = vb->vb2_queue; > @@ -1678,15 +1679,15 @@ static int __buf_prepare(struct vb2_buffer *vb, const struct v4l2_buffer *b) > > switch (q->memory) { > case V4L2_MEMORY_MMAP: > - ret = __qbuf_mmap(vb, b); > + ret = __prepare_mmap(vb, b); > break; > case V4L2_MEMORY_USERPTR: > down_read(¤t->mm->mmap_sem); > - ret = __qbuf_userptr(vb, b); > + ret = __prepare_userptr(vb, b); > up_read(¤t->mm->mmap_sem); > break; > case V4L2_MEMORY_DMABUF: > - ret = __qbuf_dmabuf(vb, b); > + ret = __prepare_dmabuf(vb, b); > break; > default: > WARN(1, "Invalid queue type\n"); > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Sakari, Thank you for the patch. On Friday 11 Sep 2015 14:50:24 Sakari Ailus wrote: > 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> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/media/v4l2-core/videobuf2-core.c | 19 ++++++++++--------- > 1 file changed, 10 insertions(+), 9 deletions(-) > > diff --git a/drivers/media/v4l2-core/videobuf2-core.c > b/drivers/media/v4l2-core/videobuf2-core.c index b866a6b..af6a23a 100644 > --- a/drivers/media/v4l2-core/videobuf2-core.c > +++ b/drivers/media/v4l2-core/videobuf2-core.c > @@ -1391,18 +1391,19 @@ static void __fill_vb2_buffer(struct vb2_buffer *vb, > const struct v4l2_buffer *b } > > /** > - * __qbuf_mmap() - handle qbuf of an MMAP buffer > + * __prepare_mmap() - prepare an MMAP buffer > */ > -static int __qbuf_mmap(struct vb2_buffer *vb, const struct v4l2_buffer *b) > +static int __prepare_mmap(struct vb2_buffer *vb, const struct v4l2_buffer > *b) { > __fill_vb2_buffer(vb, b, vb->v4l2_planes); > return call_vb_qop(vb, buf_prepare, vb); > } > > /** > - * __qbuf_userptr() - handle qbuf of a USERPTR buffer > + * __prepare_userptr() - prepare a USERPTR buffer > */ > -static int __qbuf_userptr(struct vb2_buffer *vb, const struct v4l2_buffer > *b) +static int __prepare_userptr(struct vb2_buffer *vb, > + const struct v4l2_buffer *b) > { > struct v4l2_plane planes[VIDEO_MAX_PLANES]; > struct vb2_queue *q = vb->vb2_queue; > @@ -1504,9 +1505,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 struct v4l2_buffer > *b) +static int __prepare_dmabuf(struct vb2_buffer *vb, const struct > v4l2_buffer *b) { > struct v4l2_plane planes[VIDEO_MAX_PLANES]; > struct vb2_queue *q = vb->vb2_queue; > @@ -1678,15 +1679,15 @@ static int __buf_prepare(struct vb2_buffer *vb, > const struct v4l2_buffer *b) > > switch (q->memory) { > case V4L2_MEMORY_MMAP: > - ret = __qbuf_mmap(vb, b); > + ret = __prepare_mmap(vb, b); > break; > case V4L2_MEMORY_USERPTR: > down_read(¤t->mm->mmap_sem); > - ret = __qbuf_userptr(vb, b); > + ret = __prepare_userptr(vb, b); > up_read(¤t->mm->mmap_sem); > break; > case V4L2_MEMORY_DMABUF: > - ret = __qbuf_dmabuf(vb, b); > + ret = __prepare_dmabuf(vb, b); > break; > default: > WARN(1, "Invalid queue type\n");
diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c index b866a6b..af6a23a 100644 --- a/drivers/media/v4l2-core/videobuf2-core.c +++ b/drivers/media/v4l2-core/videobuf2-core.c @@ -1391,18 +1391,19 @@ static void __fill_vb2_buffer(struct vb2_buffer *vb, const struct v4l2_buffer *b } /** - * __qbuf_mmap() - handle qbuf of an MMAP buffer + * __prepare_mmap() - prepare an MMAP buffer */ -static int __qbuf_mmap(struct vb2_buffer *vb, const struct v4l2_buffer *b) +static int __prepare_mmap(struct vb2_buffer *vb, const struct v4l2_buffer *b) { __fill_vb2_buffer(vb, b, vb->v4l2_planes); return call_vb_qop(vb, buf_prepare, vb); } /** - * __qbuf_userptr() - handle qbuf of a USERPTR buffer + * __prepare_userptr() - prepare a USERPTR buffer */ -static int __qbuf_userptr(struct vb2_buffer *vb, const struct v4l2_buffer *b) +static int __prepare_userptr(struct vb2_buffer *vb, + const struct v4l2_buffer *b) { struct v4l2_plane planes[VIDEO_MAX_PLANES]; struct vb2_queue *q = vb->vb2_queue; @@ -1504,9 +1505,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 struct v4l2_buffer *b) +static int __prepare_dmabuf(struct vb2_buffer *vb, const struct v4l2_buffer *b) { struct v4l2_plane planes[VIDEO_MAX_PLANES]; struct vb2_queue *q = vb->vb2_queue; @@ -1678,15 +1679,15 @@ static int __buf_prepare(struct vb2_buffer *vb, const struct v4l2_buffer *b) switch (q->memory) { case V4L2_MEMORY_MMAP: - ret = __qbuf_mmap(vb, b); + ret = __prepare_mmap(vb, b); break; case V4L2_MEMORY_USERPTR: down_read(¤t->mm->mmap_sem); - ret = __qbuf_userptr(vb, b); + ret = __prepare_userptr(vb, b); up_read(¤t->mm->mmap_sem); break; case V4L2_MEMORY_DMABUF: - ret = __qbuf_dmabuf(vb, b); + ret = __prepare_dmabuf(vb, b); break; default: WARN(1, "Invalid queue type\n");
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> --- drivers/media/v4l2-core/videobuf2-core.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)