diff options
-rw-r--r-- | drivers/media/video/videobuf-core.c | 2 | ||||
-rw-r--r-- | drivers/media/video/videobuf-dma-contig.c | 2 | ||||
-rw-r--r-- | drivers/media/video/videobuf-dma-sg.c | 2 | ||||
-rw-r--r-- | drivers/media/video/videobuf-vmalloc.c | 2 | ||||
-rw-r--r-- | include/media/videobuf-core.h | 4 | ||||
-rw-r--r-- | include/media/videobuf-dma-contig.h | 2 | ||||
-rw-r--r-- | include/media/videobuf-dma-sg.h | 2 | ||||
-rw-r--r-- | include/media/videobuf-vmalloc.h | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/drivers/media/video/videobuf-core.c b/drivers/media/video/videobuf-core.c index a96b08d3df5a..136bc3496c87 100644 --- a/drivers/media/video/videobuf-core.c +++ b/drivers/media/video/videobuf-core.c | |||
@@ -110,7 +110,7 @@ EXPORT_SYMBOL_GPL(videobuf_queue_to_vmalloc); | |||
110 | 110 | ||
111 | 111 | ||
112 | void videobuf_queue_core_init(struct videobuf_queue *q, | 112 | void videobuf_queue_core_init(struct videobuf_queue *q, |
113 | struct videobuf_queue_ops *ops, | 113 | const struct videobuf_queue_ops *ops, |
114 | struct device *dev, | 114 | struct device *dev, |
115 | spinlock_t *irqlock, | 115 | spinlock_t *irqlock, |
116 | enum v4l2_buf_type type, | 116 | enum v4l2_buf_type type, |
diff --git a/drivers/media/video/videobuf-dma-contig.c b/drivers/media/video/videobuf-dma-contig.c index c3065c4bcba9..d25f28461da1 100644 --- a/drivers/media/video/videobuf-dma-contig.c +++ b/drivers/media/video/videobuf-dma-contig.c | |||
@@ -429,7 +429,7 @@ static struct videobuf_qtype_ops qops = { | |||
429 | }; | 429 | }; |
430 | 430 | ||
431 | void videobuf_queue_dma_contig_init(struct videobuf_queue *q, | 431 | void videobuf_queue_dma_contig_init(struct videobuf_queue *q, |
432 | struct videobuf_queue_ops *ops, | 432 | const struct videobuf_queue_ops *ops, |
433 | struct device *dev, | 433 | struct device *dev, |
434 | spinlock_t *irqlock, | 434 | spinlock_t *irqlock, |
435 | enum v4l2_buf_type type, | 435 | enum v4l2_buf_type type, |
diff --git a/drivers/media/video/videobuf-dma-sg.c b/drivers/media/video/videobuf-dma-sg.c index a583d394696e..fa78555b118b 100644 --- a/drivers/media/video/videobuf-dma-sg.c +++ b/drivers/media/video/videobuf-dma-sg.c | |||
@@ -702,7 +702,7 @@ void *videobuf_sg_alloc(size_t size) | |||
702 | } | 702 | } |
703 | 703 | ||
704 | void videobuf_queue_sg_init(struct videobuf_queue* q, | 704 | void videobuf_queue_sg_init(struct videobuf_queue* q, |
705 | struct videobuf_queue_ops *ops, | 705 | const struct videobuf_queue_ops *ops, |
706 | struct device *dev, | 706 | struct device *dev, |
707 | spinlock_t *irqlock, | 707 | spinlock_t *irqlock, |
708 | enum v4l2_buf_type type, | 708 | enum v4l2_buf_type type, |
diff --git a/drivers/media/video/videobuf-vmalloc.c b/drivers/media/video/videobuf-vmalloc.c index 35f3900c5633..99d646ed0248 100644 --- a/drivers/media/video/videobuf-vmalloc.c +++ b/drivers/media/video/videobuf-vmalloc.c | |||
@@ -391,7 +391,7 @@ static struct videobuf_qtype_ops qops = { | |||
391 | }; | 391 | }; |
392 | 392 | ||
393 | void videobuf_queue_vmalloc_init(struct videobuf_queue* q, | 393 | void videobuf_queue_vmalloc_init(struct videobuf_queue* q, |
394 | struct videobuf_queue_ops *ops, | 394 | const struct videobuf_queue_ops *ops, |
395 | void *dev, | 395 | void *dev, |
396 | spinlock_t *irqlock, | 396 | spinlock_t *irqlock, |
397 | enum v4l2_buf_type type, | 397 | enum v4l2_buf_type type, |
diff --git a/include/media/videobuf-core.h b/include/media/videobuf-core.h index 1c5946c44758..316fdccdcaa0 100644 --- a/include/media/videobuf-core.h +++ b/include/media/videobuf-core.h | |||
@@ -166,7 +166,7 @@ struct videobuf_queue { | |||
166 | enum v4l2_field field; | 166 | enum v4l2_field field; |
167 | enum v4l2_field last; /* for field=V4L2_FIELD_ALTERNATE */ | 167 | enum v4l2_field last; /* for field=V4L2_FIELD_ALTERNATE */ |
168 | struct videobuf_buffer *bufs[VIDEO_MAX_FRAME]; | 168 | struct videobuf_buffer *bufs[VIDEO_MAX_FRAME]; |
169 | struct videobuf_queue_ops *ops; | 169 | const struct videobuf_queue_ops *ops; |
170 | struct videobuf_qtype_ops *int_ops; | 170 | struct videobuf_qtype_ops *int_ops; |
171 | 171 | ||
172 | unsigned int streaming:1; | 172 | unsigned int streaming:1; |
@@ -195,7 +195,7 @@ void *videobuf_queue_to_vmalloc (struct videobuf_queue* q, | |||
195 | struct videobuf_buffer *buf); | 195 | struct videobuf_buffer *buf); |
196 | 196 | ||
197 | void videobuf_queue_core_init(struct videobuf_queue *q, | 197 | void videobuf_queue_core_init(struct videobuf_queue *q, |
198 | struct videobuf_queue_ops *ops, | 198 | const struct videobuf_queue_ops *ops, |
199 | struct device *dev, | 199 | struct device *dev, |
200 | spinlock_t *irqlock, | 200 | spinlock_t *irqlock, |
201 | enum v4l2_buf_type type, | 201 | enum v4l2_buf_type type, |
diff --git a/include/media/videobuf-dma-contig.h b/include/media/videobuf-dma-contig.h index 549386681aab..ebaa9bc1ee8d 100644 --- a/include/media/videobuf-dma-contig.h +++ b/include/media/videobuf-dma-contig.h | |||
@@ -17,7 +17,7 @@ | |||
17 | #include <media/videobuf-core.h> | 17 | #include <media/videobuf-core.h> |
18 | 18 | ||
19 | void videobuf_queue_dma_contig_init(struct videobuf_queue *q, | 19 | void videobuf_queue_dma_contig_init(struct videobuf_queue *q, |
20 | struct videobuf_queue_ops *ops, | 20 | const struct videobuf_queue_ops *ops, |
21 | struct device *dev, | 21 | struct device *dev, |
22 | spinlock_t *irqlock, | 22 | spinlock_t *irqlock, |
23 | enum v4l2_buf_type type, | 23 | enum v4l2_buf_type type, |
diff --git a/include/media/videobuf-dma-sg.h b/include/media/videobuf-dma-sg.h index dda47f0082e9..53e72f787175 100644 --- a/include/media/videobuf-dma-sg.h +++ b/include/media/videobuf-dma-sg.h | |||
@@ -103,7 +103,7 @@ struct videobuf_dmabuf *videobuf_to_dma (struct videobuf_buffer *buf); | |||
103 | void *videobuf_sg_alloc(size_t size); | 103 | void *videobuf_sg_alloc(size_t size); |
104 | 104 | ||
105 | void videobuf_queue_sg_init(struct videobuf_queue* q, | 105 | void videobuf_queue_sg_init(struct videobuf_queue* q, |
106 | struct videobuf_queue_ops *ops, | 106 | const struct videobuf_queue_ops *ops, |
107 | struct device *dev, | 107 | struct device *dev, |
108 | spinlock_t *irqlock, | 108 | spinlock_t *irqlock, |
109 | enum v4l2_buf_type type, | 109 | enum v4l2_buf_type type, |
diff --git a/include/media/videobuf-vmalloc.h b/include/media/videobuf-vmalloc.h index e87222c6a125..1ffdb6624436 100644 --- a/include/media/videobuf-vmalloc.h +++ b/include/media/videobuf-vmalloc.h | |||
@@ -30,7 +30,7 @@ struct videobuf_vmalloc_memory | |||
30 | }; | 30 | }; |
31 | 31 | ||
32 | void videobuf_queue_vmalloc_init(struct videobuf_queue* q, | 32 | void videobuf_queue_vmalloc_init(struct videobuf_queue* q, |
33 | struct videobuf_queue_ops *ops, | 33 | const struct videobuf_queue_ops *ops, |
34 | void *dev, | 34 | void *dev, |
35 | spinlock_t *irqlock, | 35 | spinlock_t *irqlock, |
36 | enum v4l2_buf_type type, | 36 | enum v4l2_buf_type type, |