diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-03-28 08:33:23 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-05-19 12:57:52 -0300 |
| commit | f4fce60e8b1559306fa1112287bc8765f6977de3 (patch) | |
| tree | 4700e3c1dd3527d09c77ae808afc7605feee893e | |
| parent | 037c75eb14cd6adb837f81f0c2b2a52c31c91e69 (diff) | |
V4L/DVB: v4l 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.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | drivers/media/video/videobuf-core.c | 9 | ||||
| -rw-r--r-- | drivers/media/video/videobuf-dvb.c | 2 | ||||
| -rw-r--r-- | include/media/videobuf-core.h | 4 |
3 files changed, 7 insertions, 8 deletions
diff --git a/drivers/media/video/videobuf-core.c b/drivers/media/video/videobuf-core.c index 26241a833894..fabe45c4163e 100644 --- a/drivers/media/video/videobuf-core.c +++ b/drivers/media/video/videobuf-core.c @@ -105,15 +105,14 @@ int videobuf_iolock(struct videobuf_queue *q, struct videobuf_buffer *vb, } 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 --git a/drivers/media/video/videobuf-dvb.c b/drivers/media/video/videobuf-dvb.c index 0afb62e63d99..3f76398968b8 100644 --- a/drivers/media/video/videobuf-dvb.c +++ b/drivers/media/video/videobuf-dvb.c @@ -67,7 +67,7 @@ static int videobuf_dvb_thread(void *data) 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 --git a/include/media/videobuf-core.h b/include/media/videobuf-core.h index 8fe3254ed952..f73e297e3735 100644 --- a/include/media/videobuf-core.h +++ b/include/media/videobuf-core.h @@ -185,8 +185,8 @@ int videobuf_iolock(struct videobuf_queue *q, struct videobuf_buffer *vb, 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, |