The patch number 14700 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]>
v4l videobuf: rename .vmalloc to .vaddr
Rename the .vmalloc op in struct videobuf_qtype_ops to .vaddr. This op returns
the virtual kernel address of a buffer. vaddr is a lot less confusing than
vmalloc since this callback does do any allocations.
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 | 4 ++--
linux/drivers/media/video/videobuf-dma-contig.c | 4 ++--
linux/drivers/media/video/videobuf-dma-sg.c | 4 ++--
linux/drivers/media/video/videobuf-vmalloc.c | 2 +-
linux/include/media/videobuf-core.h | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff -r 754021c43b82 -r a243f2ab0c81 linux/drivers/media/video/videobuf-core.c
--- a/linux/drivers/media/video/videobuf-core.c Mon May 10 01:58:30 2010 -0300
+++ b/linux/drivers/media/video/videobuf-core.c Mon May 10 01:59:29 2010 -0300
@@ -109,8 +109,8 @@
void *videobuf_queue_to_vmalloc(struct videobuf_queue *q,
struct videobuf_buffer *buf)
{
- if (q->int_ops->vmalloc)
- return q->int_ops->vmalloc(buf);
+ if (q->int_ops->vaddr)
+ return q->int_ops->vaddr(buf);
else
return NULL;
}
diff -r 754021c43b82 -r a243f2ab0c81
linux/drivers/media/video/videobuf-dma-contig.c
--- a/linux/drivers/media/video/videobuf-dma-contig.c Mon May 10 01:58:30
2010 -0300
+++ b/linux/drivers/media/video/videobuf-dma-contig.c Mon May 10 01:59:29
2010 -0300
@@ -208,7 +208,7 @@
return vb;
}
-static void *__videobuf_to_vmalloc(struct videobuf_buffer *buf)
+static void *__videobuf_to_vaddr(struct videobuf_buffer *buf)
{
struct videobuf_dma_contig_memory *mem = buf->priv;
@@ -418,7 +418,7 @@
.mmap_mapper = __videobuf_mmap_mapper,
.video_copy_to_user = __videobuf_copy_to_user,
.copy_stream = __videobuf_copy_stream,
- .vmalloc = __videobuf_to_vmalloc,
+ .vaddr = __videobuf_to_vaddr,
};
void videobuf_queue_dma_contig_init(struct videobuf_queue *q,
diff -r 754021c43b82 -r a243f2ab0c81 linux/drivers/media/video/videobuf-dma-sg.c
--- a/linux/drivers/media/video/videobuf-dma-sg.c Mon May 10 01:58:30
2010 -0300
+++ b/linux/drivers/media/video/videobuf-dma-sg.c Mon May 10 01:59:29
2010 -0300
@@ -495,7 +495,7 @@
return vb;
}
-static void *__videobuf_to_vmalloc(struct videobuf_buffer *buf)
+static void *__videobuf_to_vaddr(struct videobuf_buffer *buf)
{
struct videobuf_dma_sg_memory *mem = buf->priv;
BUG_ON(!mem);
@@ -735,7 +735,7 @@
.mmap_mapper = __videobuf_mmap_mapper,
.video_copy_to_user = __videobuf_copy_to_user,
.copy_stream = __videobuf_copy_stream,
- .vmalloc = __videobuf_to_vmalloc,
+ .vaddr = __videobuf_to_vaddr,
};
void *videobuf_sg_alloc(size_t size)
diff -r 754021c43b82 -r a243f2ab0c81
linux/drivers/media/video/videobuf-vmalloc.c
--- a/linux/drivers/media/video/videobuf-vmalloc.c Mon May 10 01:58:30
2010 -0300
+++ b/linux/drivers/media/video/videobuf-vmalloc.c Mon May 10 01:59:29
2010 -0300
@@ -378,7 +378,7 @@
.mmap_mapper = __videobuf_mmap_mapper,
.video_copy_to_user = __videobuf_copy_to_user,
.copy_stream = __videobuf_copy_stream,
- .vmalloc = videobuf_to_vmalloc,
+ .vaddr = videobuf_to_vmalloc,
};
void videobuf_queue_vmalloc_init(struct videobuf_queue *q,
diff -r 754021c43b82 -r a243f2ab0c81 linux/include/media/videobuf-core.h
--- a/linux/include/media/videobuf-core.h Mon May 10 01:58:30 2010 -0300
+++ b/linux/include/media/videobuf-core.h Mon May 10 01:59:29 2010 -0300
@@ -128,7 +128,7 @@
u32 magic;
struct videobuf_buffer *(*alloc)(size_t size);
- void *(*vmalloc) (struct videobuf_buffer *buf);
+ void *(*vaddr) (struct videobuf_buffer *buf);
int (*iolock) (struct videobuf_queue *q,
struct videobuf_buffer *vb,
struct v4l2_framebuffer *fbuf);
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/a243f2ab0c81213247114f61499051ea7e7cfabb
_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
