microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[media] vb2: start messages with a lower-case for consistency 

The kernel debug messages produced by vb2 started either with a
lower or an upper case character. Switched all to use lower-case
which seemed to be what was used in the majority of the messages.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Pawel Osciak <pawel@osciak.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Hans Verkuil 2014-04-07 09:13:22 -03:00 коммит произвёл Mauro Carvalho Chehab
Родитель 7bb6edd37f
Коммит 3050040b4e
1 изменённых файлов: 29 добавлений и 29 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

58
drivers/media/v4l2-core/videobuf2-core.c
Просмотреть файл

@ -225,7 +225,7 @@ static void __vb2_buf_mem_free(struct vb2_buffer *vb)
for (plane = 0; plane < vb->num_planes; ++plane) { for (plane = 0; plane < vb->num_planes; ++plane) {
call_void_memop(vb, put, vb->planes[plane].mem_priv); call_void_memop(vb, put, vb->planes[plane].mem_priv);
vb->planes[plane].mem_priv = NULL; vb->planes[plane].mem_priv = NULL;
dprintk(3, "Freed plane %d of buffer %d\n", plane, dprintk(3, "freed plane %d of buffer %d\n", plane,
vb->v4l2_buf.index); vb->v4l2_buf.index);
} }
} }
@ -320,7 +320,7 @@ static void __setup_offsets(struct vb2_queue *q, unsigned int n)
for (plane = 0; plane < vb->num_planes; ++plane) { for (plane = 0; plane < vb->num_planes; ++plane) {
vb->v4l2_planes[plane].m.mem_offset = off; vb->v4l2_planes[plane].m.mem_offset = off;
dprintk(3, "Buffer %d, plane %d offset 0x%08lx\n", dprintk(3, "buffer %d, plane %d offset 0x%08lx\n",
buffer, plane, off); buffer, plane, off);
off += vb->v4l2_planes[plane].length; off += vb->v4l2_planes[plane].length;
@ -347,7 +347,7 @@ static int __vb2_queue_alloc(struct vb2_queue *q, enum v4l2_memory memory,
/* Allocate videobuf buffer structures */ /* Allocate videobuf buffer structures */
vb = kzalloc(q->buf_struct_size, GFP_KERNEL); vb = kzalloc(q->buf_struct_size, GFP_KERNEL);
if (!vb) { if (!vb) {
dprintk(1, "Memory alloc for buffer struct failed\n"); dprintk(1, "memory alloc for buffer struct failed\n");
break; break;
} }
@ -366,7 +366,7 @@ static int __vb2_queue_alloc(struct vb2_queue *q, enum v4l2_memory memory,
if (memory == V4L2_MEMORY_MMAP) { if (memory == V4L2_MEMORY_MMAP) {
ret = __vb2_buf_mem_alloc(vb); ret = __vb2_buf_mem_alloc(vb);
if (ret) { if (ret) {
dprintk(1, "Failed allocating memory for " dprintk(1, "failed allocating memory for "
"buffer %d\n", buffer); "buffer %d\n", buffer);
kfree(vb); kfree(vb);
break; break;
@ -378,7 +378,7 @@ static int __vb2_queue_alloc(struct vb2_queue *q, enum v4l2_memory memory,
*/ */
ret = call_vb_qop(vb, buf_init, vb); ret = call_vb_qop(vb, buf_init, vb);
if (ret) { if (ret) {
dprintk(1, "Buffer %d %p initialization" dprintk(1, "buffer %d %p initialization"
" failed\n", buffer, vb); " failed\n", buffer, vb);
__vb2_buf_mem_free(vb); __vb2_buf_mem_free(vb);
kfree(vb); kfree(vb);
@ -393,7 +393,7 @@ static int __vb2_queue_alloc(struct vb2_queue *q, enum v4l2_memory memory,
if (memory == V4L2_MEMORY_MMAP) if (memory == V4L2_MEMORY_MMAP)
__setup_offsets(q, buffer); __setup_offsets(q, buffer);
dprintk(1, "Allocated %d buffers, %d plane(s) each\n", dprintk(1, "allocated %d buffers, %d plane(s) each\n",
buffer, num_planes); buffer, num_planes);
return buffer; return buffer;
@ -550,13 +550,13 @@ static int __verify_planes_array(struct vb2_buffer *vb, const struct v4l2_buffer
/* Is memory for copying plane information present? */ /* Is memory for copying plane information present? */
if (NULL == b->m.planes) { if (NULL == b->m.planes) {
dprintk(1, "Multi-planar buffer passed but " dprintk(1, "multi-planar buffer passed but "
"planes array not provided\n"); "planes array not provided\n");
return -EINVAL; return -EINVAL;
} }
if (b->length < vb->num_planes || b->length > VIDEO_MAX_PLANES) { if (b->length < vb->num_planes || b->length > VIDEO_MAX_PLANES) {
dprintk(1, "Incorrect planes array length, " dprintk(1, "incorrect planes array length, "
"expected %d, got %d\n", vb->num_planes, b->length); "expected %d, got %d\n", vb->num_planes, b->length);
return -EINVAL; return -EINVAL;
} }
@ -917,7 +917,7 @@ static int __reqbufs(struct vb2_queue *q, struct v4l2_requestbuffers *req)
/* Finally, allocate buffers and video memory */ /* Finally, allocate buffers and video memory */
allocated_buffers = __vb2_queue_alloc(q, req->memory, num_buffers, num_planes); allocated_buffers = __vb2_queue_alloc(q, req->memory, num_buffers, num_planes);
if (allocated_buffers == 0) { if (allocated_buffers == 0) {
dprintk(1, "Memory allocation failed\n"); dprintk(1, "memory allocation failed\n");
return -ENOMEM; return -ENOMEM;
} }
@ -1026,7 +1026,7 @@ static int __create_bufs(struct vb2_queue *q, struct v4l2_create_buffers *create
allocated_buffers = __vb2_queue_alloc(q, create->memory, num_buffers, allocated_buffers = __vb2_queue_alloc(q, create->memory, num_buffers,
num_planes); num_planes);
if (allocated_buffers == 0) { if (allocated_buffers == 0) {
dprintk(1, "Memory allocation failed\n"); dprintk(1, "memory allocation failed\n");
return -ENOMEM; return -ENOMEM;
} }
@ -1171,7 +1171,7 @@ void vb2_buffer_done(struct vb2_buffer *vb, enum vb2_buffer_state state)
*/ */
vb->cnt_buf_done++; vb->cnt_buf_done++;
#endif #endif
dprintk(4, "Done processing on buffer %d, state: %d\n", dprintk(4, "done processing on buffer %d, state: %d\n",
vb->v4l2_buf.index, state); vb->v4l2_buf.index, state);
/* sync buffers */ /* sync buffers */
@ -1868,7 +1868,7 @@ static int __vb2_wait_for_done_vb(struct vb2_queue *q, int nonblocking)
int ret; int ret;
if (!q->streaming) { if (!q->streaming) {
dprintk(1, "Streaming off, will not wait for buffers\n"); dprintk(1, "streaming off, will not wait for buffers\n");
return -EINVAL; return -EINVAL;
} }
@ -1880,7 +1880,7 @@ static int __vb2_wait_for_done_vb(struct vb2_queue *q, int nonblocking)
} }
if (nonblocking) { if (nonblocking) {
dprintk(1, "Nonblocking and no buffers to dequeue, " dprintk(1, "nonblocking and no buffers to dequeue, "
"will not wait\n"); "will not wait\n");
return -EAGAIN; return -EAGAIN;
} }
@ -1895,7 +1895,7 @@ static int __vb2_wait_for_done_vb(struct vb2_queue *q, int nonblocking)
/* /*
* All locks have been released, it is safe to sleep now. * All locks have been released, it is safe to sleep now.
*/ */
dprintk(3, "Will sleep waiting for buffers\n"); dprintk(3, "will sleep waiting for buffers\n");
ret = wait_event_interruptible(q->done_wq, ret = wait_event_interruptible(q->done_wq,
!list_empty(&q->done_list) || !q->streaming); !list_empty(&q->done_list) || !q->streaming);
@ -1905,7 +1905,7 @@ static int __vb2_wait_for_done_vb(struct vb2_queue *q, int nonblocking)
*/ */
call_void_qop(q, wait_finish, q); call_void_qop(q, wait_finish, q);
if (ret) { if (ret) {
dprintk(1, "Sleep was interrupted\n"); dprintk(1, "sleep was interrupted\n");
return ret; return ret;
} }
} }
@ -1960,7 +1960,7 @@ static int __vb2_get_done_vb(struct vb2_queue *q, struct vb2_buffer **vb,
int vb2_wait_for_all_buffers(struct vb2_queue *q) int vb2_wait_for_all_buffers(struct vb2_queue *q)
{ {
if (!q->streaming) { if (!q->streaming) {
dprintk(1, "Streaming off, will not wait for buffers\n"); dprintk(1, "streaming off, will not wait for buffers\n");
return -EINVAL; return -EINVAL;
} }
@ -2009,13 +2009,13 @@ static int vb2_internal_dqbuf(struct vb2_queue *q, struct v4l2_buffer *b, bool n
switch (vb->state) { switch (vb->state) {
case VB2_BUF_STATE_DONE: case VB2_BUF_STATE_DONE:
dprintk(3, "Returning done buffer\n"); dprintk(3, "returning done buffer\n");
break; break;
case VB2_BUF_STATE_ERROR: case VB2_BUF_STATE_ERROR:
dprintk(3, "Returning done buffer with errors\n"); dprintk(3, "returning done buffer with errors\n");
break; break;
default: default:
dprintk(1, "Invalid buffer state\n"); dprintk(1, "invalid buffer state\n");
return -EINVAL; return -EINVAL;
} }
@ -2289,17 +2289,17 @@ int vb2_expbuf(struct vb2_queue *q, struct v4l2_exportbuffer *eb)
struct dma_buf *dbuf; struct dma_buf *dbuf;
if (q->memory != V4L2_MEMORY_MMAP) { if (q->memory != V4L2_MEMORY_MMAP) {
dprintk(1, "Queue is not currently set up for mmap\n"); dprintk(1, "queue is not currently set up for mmap\n");
return -EINVAL; return -EINVAL;
} }
if (!q->mem_ops->get_dmabuf) { if (!q->mem_ops->get_dmabuf) {
dprintk(1, "Queue does not support DMA buffer exporting\n"); dprintk(1, "queue does not support DMA buffer exporting\n");
return -EINVAL; return -EINVAL;
} }
if (eb->flags & ~(O_CLOEXEC | O_ACCMODE)) { if (eb->flags & ~(O_CLOEXEC | O_ACCMODE)) {
dprintk(1, "Queue does support only O_CLOEXEC and access mode flags\n"); dprintk(1, "queue does support only O_CLOEXEC and access mode flags\n");
return -EINVAL; return -EINVAL;
} }
@ -2329,7 +2329,7 @@ int vb2_expbuf(struct vb2_queue *q, struct v4l2_exportbuffer *eb)
dbuf = call_ptr_memop(vb, get_dmabuf, vb_plane->mem_priv, eb->flags & O_ACCMODE); dbuf = call_ptr_memop(vb, get_dmabuf, vb_plane->mem_priv, eb->flags & O_ACCMODE);
if (IS_ERR_OR_NULL(dbuf)) { if (IS_ERR_OR_NULL(dbuf)) {
dprintk(1, "Failed to export buffer %d, plane %d\n", dprintk(1, "failed to export buffer %d, plane %d\n",
eb->index, eb->plane); eb->index, eb->plane);
return -EINVAL; return -EINVAL;
} }
@ -2378,7 +2378,7 @@ int vb2_mmap(struct vb2_queue *q, struct vm_area_struct *vma)
unsigned long length; unsigned long length;
if (q->memory != V4L2_MEMORY_MMAP) { if (q->memory != V4L2_MEMORY_MMAP) {
dprintk(1, "Queue is not currently set up for mmap\n"); dprintk(1, "queue is not currently set up for mmap\n");
return -EINVAL; return -EINVAL;
} }
@ -2386,17 +2386,17 @@ int vb2_mmap(struct vb2_queue *q, struct vm_area_struct *vma)
* Check memory area access mode. * Check memory area access mode.
*/ */
if (!(vma->vm_flags & VM_SHARED)) { if (!(vma->vm_flags & VM_SHARED)) {
dprintk(1, "Invalid vma flags, VM_SHARED needed\n"); dprintk(1, "invalid vma flags, VM_SHARED needed\n");
return -EINVAL; return -EINVAL;
} }
if (V4L2_TYPE_IS_OUTPUT(q->type)) { if (V4L2_TYPE_IS_OUTPUT(q->type)) {
if (!(vma->vm_flags & VM_WRITE)) { if (!(vma->vm_flags & VM_WRITE)) {
dprintk(1, "Invalid vma flags, VM_WRITE needed\n"); dprintk(1, "invalid vma flags, VM_WRITE needed\n");
return -EINVAL; return -EINVAL;
} }
} else { } else {
if (!(vma->vm_flags & VM_READ)) { if (!(vma->vm_flags & VM_READ)) {
dprintk(1, "Invalid vma flags, VM_READ needed\n"); dprintk(1, "invalid vma flags, VM_READ needed\n");
return -EINVAL; return -EINVAL;
} }
} }
@ -2430,7 +2430,7 @@ int vb2_mmap(struct vb2_queue *q, struct vm_area_struct *vma)
if (ret) if (ret)
return ret; return ret;
dprintk(3, "Buffer %d, plane %d successfully mapped\n", buffer, plane); dprintk(3, "buffer %d, plane %d successfully mapped\n", buffer, plane);
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(vb2_mmap); EXPORT_SYMBOL_GPL(vb2_mmap);
@ -2448,7 +2448,7 @@ unsigned long vb2_get_unmapped_area(struct vb2_queue *q,
int ret; int ret;
if (q->memory != V4L2_MEMORY_MMAP) { if (q->memory != V4L2_MEMORY_MMAP) {
dprintk(1, "Queue is not currently set up for mmap\n"); dprintk(1, "queue is not currently set up for mmap\n");
return -EINVAL; return -EINVAL;
} }