The patch number 14701 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: rename videobuf_queue_to_vmalloc to videobuf_queue_to_vaddr
Ths function returns the virtual kernel address of the buffer and has
nothing to do with allocation.
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 | 9 ++++-----
linux/drivers/media/video/videobuf-dvb.c | 2 +-
linux/include/media/videobuf-core.h | 4 ++--
3 files changed, 7 insertions(+), 8 deletions(-)
diff -r a243f2ab0c81 -r 449fad31cdea linux/drivers/media/video/videobuf-core.c
--- a/linux/drivers/media/video/videobuf-core.c Mon May 10 01:59:29 2010 -0300
+++ b/linux/drivers/media/video/videobuf-core.c Mon May 10 02:00:32 2010 -0300
@@ -106,15 +106,14 @@
}
EXPORT_SYMBOL_GPL(videobuf_iolock);
-void *videobuf_queue_to_vmalloc(struct videobuf_queue *q,
- struct videobuf_buffer *buf)
+void *videobuf_queue_to_vaddr(struct videobuf_queue *q,
+ struct videobuf_buffer *buf)
{
if (q->int_ops->vaddr)
return q->int_ops->vaddr(buf);
- else
- return NULL;
+ return NULL;
}
-EXPORT_SYMBOL_GPL(videobuf_queue_to_vmalloc);
+EXPORT_SYMBOL_GPL(videobuf_queue_to_vaddr);
/* --------------------------------------------------------------------- */
diff -r a243f2ab0c81 -r 449fad31cdea linux/drivers/media/video/videobuf-dvb.c
--- a/linux/drivers/media/video/videobuf-dvb.c Mon May 10 01:59:29 2010 -0300
+++ b/linux/drivers/media/video/videobuf-dvb.c Mon May 10 02:00:32 2010 -0300
@@ -71,7 +71,7 @@
try_to_freeze();
/* feed buffer data to demux */
- outp = videobuf_queue_to_vmalloc (&dvb->dvbq, buf);
+ outp = videobuf_queue_to_vaddr(&dvb->dvbq, buf);
if (buf->state == VIDEOBUF_DONE)
dvb_dmx_swfilter(&dvb->demux, outp,
diff -r a243f2ab0c81 -r 449fad31cdea linux/include/media/videobuf-core.h
--- a/linux/include/media/videobuf-core.h Mon May 10 01:59:29 2010 -0300
+++ b/linux/include/media/videobuf-core.h Mon May 10 02:00:32 2010 -0300
@@ -185,8 +185,8 @@
struct videobuf_buffer *videobuf_alloc(struct videobuf_queue *q);
/* Used on videobuf-dvb */
-void *videobuf_queue_to_vmalloc(struct videobuf_queue *q,
- struct videobuf_buffer *buf);
+void *videobuf_queue_to_vaddr(struct videobuf_queue *q,
+ struct videobuf_buffer *buf);
void videobuf_queue_core_init(struct videobuf_queue *q,
const struct videobuf_queue_ops *ops,
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/449fad31cdea44fd14d9cfb7b412800fc5d89b95
_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
