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

V4L/DVB: v4l videobuf: use struct videobuf_buffer * instead of void * for videobuf_alloc

Browse Source 
videobuf_alloc() returned a void *. Change to struct videobuf_buffer *
to get better type checking.

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:09:44 -03:00
committed by Mauro Carvalho Chehab
parent 63e424856b
commit a4cf4cac29
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,7 +52,7 @@ MODULE_LICENSE("GPL");
#define CALL(q, f, arg...) \ #define CALL(q, f, arg...) \
((q->int_ops->f) ? q->int_ops->f(arg) : 0) ((q->int_ops->f) ? q->int_ops->f(arg) : 0)
void *videobuf_alloc(struct videobuf_queue *q) struct videobuf_buffer *videobuf_alloc(struct videobuf_queue *q)
{ {
struct videobuf_buffer *vb; struct videobuf_buffer *vb;

2
drivers/media/video/videobuf-dma-contig.c
View File

@@ -190,7 +190,7 @@ static int videobuf_dma_contig_user_get(struct videobuf_dma_contig_memory *mem,
return ret; return ret;
} }
static void *__videobuf_alloc(size_t size) static struct videobuf_buffer *__videobuf_alloc(size_t size)
{ {
struct videobuf_dma_contig_memory *mem; struct videobuf_dma_contig_memory *mem;
struct videobuf_buffer *vb; struct videobuf_buffer *vb;

2
drivers/media/video/videobuf-dma-sg.c
View File

@@ -439,7 +439,7 @@ static const struct vm_operations_struct videobuf_vm_ops = {
struct videobuf_dma_sg_memory struct videobuf_dma_sg_memory
*/ */
static void *__videobuf_alloc(size_t size) static struct videobuf_buffer *__videobuf_alloc(size_t size)
{ {
struct videobuf_dma_sg_memory *mem; struct videobuf_dma_sg_memory *mem;
struct videobuf_buffer *vb; struct videobuf_buffer *vb;

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

@@ -135,7 +135,7 @@ static const struct vm_operations_struct videobuf_vm_ops = {
struct videobuf_dma_sg_memory struct videobuf_dma_sg_memory
*/ */
static void *__videobuf_alloc(size_t size) static struct videobuf_buffer *__videobuf_alloc(size_t size)
{ {
struct videobuf_vmalloc_memory *mem; struct videobuf_vmalloc_memory *mem;
struct videobuf_buffer *vb; struct videobuf_buffer *vb;

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

@@ -127,7 +127,7 @@ struct videobuf_queue_ops {
struct videobuf_qtype_ops { struct videobuf_qtype_ops {
u32 magic; u32 magic;
void *(*alloc) (size_t size); struct videobuf_buffer *(*alloc)(size_t size);
void *(*vmalloc) (struct videobuf_buffer *buf); void *(*vmalloc) (struct videobuf_buffer *buf);
int (*iolock) (struct videobuf_queue *q, int (*iolock) (struct videobuf_queue *q,
struct videobuf_buffer *vb, struct videobuf_buffer *vb,
@@ -182,7 +182,7 @@ int videobuf_waiton(struct videobuf_buffer *vb, int non_blocking, int intr);
int videobuf_iolock(struct videobuf_queue *q, struct videobuf_buffer *vb, int videobuf_iolock(struct videobuf_queue *q, struct videobuf_buffer *vb,
struct v4l2_framebuffer *fbuf); struct v4l2_framebuffer *fbuf);
void *videobuf_alloc(struct videobuf_queue* q); struct videobuf_buffer *videobuf_alloc(struct videobuf_queue *q);
/* Used on videobuf-dvb */ /* Used on videobuf-dvb */
void *videobuf_queue_to_vmalloc(struct videobuf_queue *q, void *videobuf_queue_to_vmalloc(struct videobuf_queue *q,