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

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

V4L/DVB: 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.

Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent a4cf4cac

drivers/media/video/videobuf-core.c

+2 −2
Original line number Diff line number Diff line
@@ -108,8 +108,8 @@ EXPORT_SYMBOL_GPL(videobuf_iolock); 
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;

}

drivers/media/video/videobuf-dma-contig.c

+2 −2
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ static struct videobuf_buffer *__videobuf_alloc(size_t size) 
	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;
@@ -414,7 +414,7 @@ static struct videobuf_qtype_ops qops = { 
	.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,

drivers/media/video/videobuf-dma-sg.c

+2 −2
Original line number Diff line number Diff line
@@ -460,7 +460,7 @@ static struct videobuf_buffer *__videobuf_alloc(size_t size) 
	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);
@@ -700,7 +700,7 @@ static struct videobuf_qtype_ops sg_ops = { 
	.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)

drivers/media/video/videobuf-vmalloc.c

+1 −1
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ static struct videobuf_qtype_ops qops = { 
	.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,

include/media/videobuf-core.h

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ struct videobuf_qtype_ops { 
	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);