aboutsummaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2015-11-20 05:32:00 -0500
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-12-18 11:00:50 -0500
commit10cc3b1e12964ae71aefefb2c2b61304d2264cac (patch)
tree14bfd6f86242401cb59ce8db6370abce2eca6eb6 /include/media
parentdf868ea1c850d8a80bc2643a08e49ae62cca7bbc (diff)
[media] videobuf2-core: fill_user_buffer and copy_timestamp should return void
This ops can never fail, so make these void functions. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/videobuf2-core.h17
1 files changed, 14 insertions, 3 deletions
diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h
index cc94c9d1c2c4..b88dbba37590 100644
--- a/include/media/videobuf2-core.h
+++ b/include/media/videobuf2-core.h
@@ -369,11 +369,22 @@ struct vb2_ops {
369 void (*buf_queue)(struct vb2_buffer *vb); 369 void (*buf_queue)(struct vb2_buffer *vb);
370}; 370};
371 371
372/**
373 * struct vb2_ops - driver-specific callbacks
374 *
375 * @fill_user_buffer: given a vb2_buffer fill in the userspace structure.
376 * For V4L2 this is a struct v4l2_buffer.
377 * @fill_vb2_buffer: given a userspace structure, fill in the vb2_buffer.
378 * If the userspace structure is invalid, then this op
379 * will return an error.
380 * @copy_timestamp: copy the timestamp from a userspace structure to
381 * the vb2_buffer struct.
382 */
372struct vb2_buf_ops { 383struct vb2_buf_ops {
373 int (*fill_user_buffer)(struct vb2_buffer *vb, void *pb); 384 void (*fill_user_buffer)(struct vb2_buffer *vb, void *pb);
374 int (*fill_vb2_buffer)(struct vb2_buffer *vb, const void *pb, 385 int (*fill_vb2_buffer)(struct vb2_buffer *vb, const void *pb,
375 struct vb2_plane *planes); 386 struct vb2_plane *planes);
376 int (*copy_timestamp)(struct vb2_buffer *vb, const void *pb); 387 void (*copy_timestamp)(struct vb2_buffer *vb, const void *pb);
377}; 388};
378 389
379/** 390/**
@@ -512,7 +523,7 @@ void vb2_buffer_done(struct vb2_buffer *vb, enum vb2_buffer_state state);
512void vb2_discard_done(struct vb2_queue *q); 523void vb2_discard_done(struct vb2_queue *q);
513int vb2_wait_for_all_buffers(struct vb2_queue *q); 524int vb2_wait_for_all_buffers(struct vb2_queue *q);
514 525
515int vb2_core_querybuf(struct vb2_queue *q, unsigned int index, void *pb); 526void vb2_core_querybuf(struct vb2_queue *q, unsigned int index, void *pb);
516int vb2_core_reqbufs(struct vb2_queue *q, enum vb2_memory memory, 527int vb2_core_reqbufs(struct vb2_queue *q, enum vb2_memory memory,
517 unsigned int *count); 528 unsigned int *count);
518int vb2_core_create_bufs(struct vb2_queue *q, enum vb2_memory memory, 529int vb2_core_create_bufs(struct vb2_queue *q, enum vb2_memory memory,