lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

V4L/DVB: v4l videobuf: rename videobuf_queue_to_vmalloc to videobuf_queue_to_vaddr

Browse Source 
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>
This commit is contained in:
Hans Verkuil 2010-03-28 08:33:23 -03:00 committed by Mauro Carvalho Chehab
parent 037c75eb14
commit f4fce60e8b
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/media/video/videobuf-core.c
View File

@ -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);
/* --------------------------------------------------------------------- */

2
drivers/media/video/videobuf-dvb.c
View File

@ -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,

4
include/media/videobuf-core.h
View File

@ -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,