diff options
| author | Mauro Carvalho Chehab | 2007-10-08 17:20:02 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2007-10-10 05:03:14 +0200 |
| commit | d4cae5a50021271b9ef4e5e39e71e177d12fa8cb (patch) | |
| tree | 75f3def69e6b35fc02e46af5661bb45aa006ba9d /include/media | |
| parent | V4L/DVB (6291): Fix: avoid oops on some SMP machines (diff) | |
| download | kernel-qcow2-linux-d4cae5a50021271b9ef4e5e39e71e177d12fa8cb.tar.gz kernel-qcow2-linux-d4cae5a50021271b9ef4e5e39e71e177d12fa8cb.tar.xz kernel-qcow2-linux-d4cae5a50021271b9ef4e5e39e71e177d12fa8cb.zip | |
V4L/DVB (6292): videobuf_core init always require callback implementation
In the past, videobuf_queue_init were used to initialize PCI DMA videobuffers.
This patch renames it, to avoid confusion with the previous kernel API, doing:
s/videobuf_queue_init/void videobuf_queue_core_init/
Also, the operations is now part of the function parameter. The function will
also add a test if this is defined, otherwise producing BUG.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/videobuf-core.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/media/videobuf-core.h b/include/media/videobuf-core.h index 9bae5a2eda66..9fa09fb800a1 100644 --- a/include/media/videobuf-core.h +++ b/include/media/videobuf-core.h @@ -181,14 +181,15 @@ int videobuf_iolock(struct videobuf_queue* q, struct videobuf_buffer *vb, void *videobuf_alloc(struct videobuf_queue* q); -void videobuf_queue_init(struct videobuf_queue *q, +void videobuf_queue_core_init(struct videobuf_queue *q, struct videobuf_queue_ops *ops, void *dev, spinlock_t *irqlock, enum v4l2_buf_type type, enum v4l2_field field, unsigned int msize, - void *priv); + void *priv, + struct videobuf_qtype_ops *int_ops); int videobuf_queue_is_busy(struct videobuf_queue *q); void videobuf_queue_cancel(struct videobuf_queue *q); |