diff options
-rw-r--r-- | drivers/media/v4l2-core/videobuf-dma-sg.c | 15 | ||||
-rw-r--r-- | include/media/videobuf-dma-sg.h | 8 |
2 files changed, 5 insertions, 18 deletions
diff --git a/drivers/media/v4l2-core/videobuf-dma-sg.c b/drivers/media/v4l2-core/videobuf-dma-sg.c index 3ff15f1c9d70..f669cedca8bd 100644 --- a/drivers/media/v4l2-core/videobuf-dma-sg.c +++ b/drivers/media/v4l2-core/videobuf-dma-sg.c | |||
@@ -145,12 +145,11 @@ struct videobuf_dmabuf *videobuf_to_dma(struct videobuf_buffer *buf) | |||
145 | } | 145 | } |
146 | EXPORT_SYMBOL_GPL(videobuf_to_dma); | 146 | EXPORT_SYMBOL_GPL(videobuf_to_dma); |
147 | 147 | ||
148 | void videobuf_dma_init(struct videobuf_dmabuf *dma) | 148 | static void videobuf_dma_init(struct videobuf_dmabuf *dma) |
149 | { | 149 | { |
150 | memset(dma, 0, sizeof(*dma)); | 150 | memset(dma, 0, sizeof(*dma)); |
151 | dma->magic = MAGIC_DMABUF; | 151 | dma->magic = MAGIC_DMABUF; |
152 | } | 152 | } |
153 | EXPORT_SYMBOL_GPL(videobuf_dma_init); | ||
154 | 153 | ||
155 | static int videobuf_dma_init_user_locked(struct videobuf_dmabuf *dma, | 154 | static int videobuf_dma_init_user_locked(struct videobuf_dmabuf *dma, |
156 | int direction, unsigned long data, unsigned long size) | 155 | int direction, unsigned long data, unsigned long size) |
@@ -195,7 +194,7 @@ static int videobuf_dma_init_user_locked(struct videobuf_dmabuf *dma, | |||
195 | return 0; | 194 | return 0; |
196 | } | 195 | } |
197 | 196 | ||
198 | int videobuf_dma_init_user(struct videobuf_dmabuf *dma, int direction, | 197 | static int videobuf_dma_init_user(struct videobuf_dmabuf *dma, int direction, |
199 | unsigned long data, unsigned long size) | 198 | unsigned long data, unsigned long size) |
200 | { | 199 | { |
201 | int ret; | 200 | int ret; |
@@ -206,9 +205,8 @@ int videobuf_dma_init_user(struct videobuf_dmabuf *dma, int direction, | |||
206 | 205 | ||
207 | return ret; | 206 | return ret; |
208 | } | 207 | } |
209 | EXPORT_SYMBOL_GPL(videobuf_dma_init_user); | ||
210 | 208 | ||
211 | int videobuf_dma_init_kernel(struct videobuf_dmabuf *dma, int direction, | 209 | static int videobuf_dma_init_kernel(struct videobuf_dmabuf *dma, int direction, |
212 | int nr_pages) | 210 | int nr_pages) |
213 | { | 211 | { |
214 | int i; | 212 | int i; |
@@ -267,9 +265,8 @@ out_free_pages: | |||
267 | return -ENOMEM; | 265 | return -ENOMEM; |
268 | 266 | ||
269 | } | 267 | } |
270 | EXPORT_SYMBOL_GPL(videobuf_dma_init_kernel); | ||
271 | 268 | ||
272 | int videobuf_dma_init_overlay(struct videobuf_dmabuf *dma, int direction, | 269 | static int videobuf_dma_init_overlay(struct videobuf_dmabuf *dma, int direction, |
273 | dma_addr_t addr, int nr_pages) | 270 | dma_addr_t addr, int nr_pages) |
274 | { | 271 | { |
275 | dprintk(1, "init overlay [%d pages @ bus 0x%lx]\n", | 272 | dprintk(1, "init overlay [%d pages @ bus 0x%lx]\n", |
@@ -284,9 +281,8 @@ int videobuf_dma_init_overlay(struct videobuf_dmabuf *dma, int direction, | |||
284 | 281 | ||
285 | return 0; | 282 | return 0; |
286 | } | 283 | } |
287 | EXPORT_SYMBOL_GPL(videobuf_dma_init_overlay); | ||
288 | 284 | ||
289 | int videobuf_dma_map(struct device *dev, struct videobuf_dmabuf *dma) | 285 | static int videobuf_dma_map(struct device *dev, struct videobuf_dmabuf *dma) |
290 | { | 286 | { |
291 | MAGIC_CHECK(dma->magic, MAGIC_DMABUF); | 287 | MAGIC_CHECK(dma->magic, MAGIC_DMABUF); |
292 | BUG_ON(0 == dma->nr_pages); | 288 | BUG_ON(0 == dma->nr_pages); |
@@ -328,7 +324,6 @@ int videobuf_dma_map(struct device *dev, struct videobuf_dmabuf *dma) | |||
328 | 324 | ||
329 | return 0; | 325 | return 0; |
330 | } | 326 | } |
331 | EXPORT_SYMBOL_GPL(videobuf_dma_map); | ||
332 | 327 | ||
333 | int videobuf_dma_unmap(struct device *dev, struct videobuf_dmabuf *dma) | 328 | int videobuf_dma_unmap(struct device *dev, struct videobuf_dmabuf *dma) |
334 | { | 329 | { |
diff --git a/include/media/videobuf-dma-sg.h b/include/media/videobuf-dma-sg.h index fb6fd4d8f4ed..d8b27854e3bf 100644 --- a/include/media/videobuf-dma-sg.h +++ b/include/media/videobuf-dma-sg.h | |||
@@ -84,16 +84,8 @@ struct videobuf_dma_sg_memory { | |||
84 | * Despite the name, this is totally unrelated to videobuf, except that | 84 | * Despite the name, this is totally unrelated to videobuf, except that |
85 | * videobuf-dma-sg uses the same API internally. | 85 | * videobuf-dma-sg uses the same API internally. |
86 | */ | 86 | */ |
87 | void videobuf_dma_init(struct videobuf_dmabuf *dma); | ||
88 | int videobuf_dma_init_user(struct videobuf_dmabuf *dma, int direction, | ||
89 | unsigned long data, unsigned long size); | ||
90 | int videobuf_dma_init_kernel(struct videobuf_dmabuf *dma, int direction, | ||
91 | int nr_pages); | ||
92 | int videobuf_dma_init_overlay(struct videobuf_dmabuf *dma, int direction, | ||
93 | dma_addr_t addr, int nr_pages); | ||
94 | int videobuf_dma_free(struct videobuf_dmabuf *dma); | 87 | int videobuf_dma_free(struct videobuf_dmabuf *dma); |
95 | 88 | ||
96 | int videobuf_dma_map(struct device *dev, struct videobuf_dmabuf *dma); | ||
97 | int videobuf_dma_unmap(struct device *dev, struct videobuf_dmabuf *dma); | 89 | int videobuf_dma_unmap(struct device *dev, struct videobuf_dmabuf *dma); |
98 | struct videobuf_dmabuf *videobuf_to_dma(struct videobuf_buffer *buf); | 90 | struct videobuf_dmabuf *videobuf_to_dma(struct videobuf_buffer *buf); |
99 | 91 | ||