The patch number 14699 was added via Douglas Schilling Landgraf
<[email protected]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List <[email protected]>
------
From: Hans Verkuil <[email protected]>
videobuf: use struct videobuf_buffer * instead of void * for videobuf_alloc
videobuf_alloc() returned a void *. Change to struct videobuf_buffer *
to get better type checking.
Priority: normal
Signed-off-by: Hans Verkuil <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Signed-off-by: Douglas Schilling Landgraf <[email protected]>
---
linux/drivers/media/video/videobuf-core.c | 2 +-
linux/drivers/media/video/videobuf-dma-contig.c | 2 +-
linux/drivers/media/video/videobuf-dma-sg.c | 2 +-
linux/drivers/media/video/videobuf-vmalloc.c | 2 +-
linux/include/media/videobuf-core.h | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
diff -r 2237b0df9d2f -r 754021c43b82 linux/drivers/media/video/videobuf-core.c
--- a/linux/drivers/media/video/videobuf-core.c Mon May 10 01:57:27 2010 -0300
+++ b/linux/drivers/media/video/videobuf-core.c Mon May 10 01:58:30 2010 -0300
@@ -53,7 +53,7 @@
#define CALL(q, f, arg...) \
((q->int_ops->f) ? q->int_ops->f(arg) : 0)
-void *videobuf_alloc(struct videobuf_queue *q)
+struct videobuf_buffer *videobuf_alloc(struct videobuf_queue *q)
{
struct videobuf_buffer *vb;
diff -r 2237b0df9d2f -r 754021c43b82
linux/drivers/media/video/videobuf-dma-contig.c
--- a/linux/drivers/media/video/videobuf-dma-contig.c Mon May 10 01:57:27
2010 -0300
+++ b/linux/drivers/media/video/videobuf-dma-contig.c Mon May 10 01:58:30
2010 -0300
@@ -194,7 +194,7 @@
return ret;
}
-static void *__videobuf_alloc(size_t size)
+static struct videobuf_buffer *__videobuf_alloc(size_t size)
{
struct videobuf_dma_contig_memory *mem;
struct videobuf_buffer *vb;
diff -r 2237b0df9d2f -r 754021c43b82 linux/drivers/media/video/videobuf-dma-sg.c
--- a/linux/drivers/media/video/videobuf-dma-sg.c Mon May 10 01:57:27
2010 -0300
+++ b/linux/drivers/media/video/videobuf-dma-sg.c Mon May 10 01:58:30
2010 -0300
@@ -474,7 +474,7 @@
struct videobuf_dma_sg_memory
*/
-static void *__videobuf_alloc(size_t size)
+static struct videobuf_buffer *__videobuf_alloc(size_t size)
{
struct videobuf_dma_sg_memory *mem;
struct videobuf_buffer *vb;
diff -r 2237b0df9d2f -r 754021c43b82
linux/drivers/media/video/videobuf-vmalloc.c
--- a/linux/drivers/media/video/videobuf-vmalloc.c Mon May 10 01:57:27
2010 -0300
+++ b/linux/drivers/media/video/videobuf-vmalloc.c Mon May 10 01:58:30
2010 -0300
@@ -140,7 +140,7 @@
struct videobuf_dma_sg_memory
*/
-static void *__videobuf_alloc(size_t size)
+static struct videobuf_buffer *__videobuf_alloc(size_t size)
{
struct videobuf_vmalloc_memory *mem;
struct videobuf_buffer *vb;
diff -r 2237b0df9d2f -r 754021c43b82 linux/include/media/videobuf-core.h
--- a/linux/include/media/videobuf-core.h Mon May 10 01:57:27 2010 -0300
+++ b/linux/include/media/videobuf-core.h Mon May 10 01:58:30 2010 -0300
@@ -127,7 +127,7 @@
struct videobuf_qtype_ops {
u32 magic;
- void *(*alloc) (size_t size);
+ struct videobuf_buffer *(*alloc)(size_t size);
void *(*vmalloc) (struct videobuf_buffer *buf);
int (*iolock) (struct videobuf_queue *q,
struct videobuf_buffer *vb,
@@ -182,7 +182,7 @@
int videobuf_iolock(struct videobuf_queue *q, struct videobuf_buffer *vb,
struct v4l2_framebuffer *fbuf);
-void *videobuf_alloc(struct videobuf_queue* q);
+struct videobuf_buffer *videobuf_alloc(struct videobuf_queue *q);
/* Used on videobuf-dvb */
void *videobuf_queue_to_vmalloc(struct videobuf_queue *q,
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/754021c43b82faeef5a1aa7e4bcf9b77eeec46f9
_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
