Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4fce60e authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

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: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 037c75eb

drivers/media/video/videobuf-core.c

+4 −5
Original line number Diff line number Diff line
@@ -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,

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;

}

EXPORT_SYMBOL_GPL(videobuf_queue_to_vmalloc);

EXPORT_SYMBOL_GPL(videobuf_queue_to_vaddr);



/* --------------------------------------------------------------------- */

drivers/media/video/videobuf-dvb.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

include/media/videobuf-core.h

+2 −2
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ 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,

void *videobuf_queue_to_vaddr(struct videobuf_queue *q,

			      struct videobuf_buffer *buf);



void videobuf_queue_core_init(struct videobuf_queue *q,