diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-03-28 06:54:29 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-05-19 11:57:50 -0400 |
commit | 53aaf07637baae8f53c33b803bbc96047d8da1c4 (patch) | |
tree | e620ce3c28dae607e34a2b6bea0e4c0edc3cff4e /drivers/media/video/videobuf-dma-contig.c | |
parent | 33435167e6dc9e23a97a494cec6b8ca47f8ded75 (diff) |
V4L/DVB: v4l videobuf: remove mmap_free callback
Remove the mmap_free callback from struct videobuf_qtype_ops.
All implementations of this callback do the same trivial check: return
-EBUSY if any buffer is mmapped. That can also be tested in the
videobuf core.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/videobuf-dma-contig.c')
-rw-r--r-- | drivers/media/video/videobuf-dma-contig.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/media/video/videobuf-dma-contig.c b/drivers/media/video/videobuf-dma-contig.c index dce4f3aa4af1..0a32cf810c88 100644 --- a/drivers/media/video/videobuf-dma-contig.c +++ b/drivers/media/video/videobuf-dma-contig.c | |||
@@ -263,19 +263,6 @@ static int __videobuf_iolock(struct videobuf_queue *q, | |||
263 | return 0; | 263 | return 0; |
264 | } | 264 | } |
265 | 265 | ||
266 | static int __videobuf_mmap_free(struct videobuf_queue *q) | ||
267 | { | ||
268 | unsigned int i; | ||
269 | |||
270 | dev_dbg(q->dev, "%s\n", __func__); | ||
271 | for (i = 0; i < VIDEO_MAX_FRAME; i++) { | ||
272 | if (q->bufs[i] && q->bufs[i]->map) | ||
273 | return -EBUSY; | ||
274 | } | ||
275 | |||
276 | return 0; | ||
277 | } | ||
278 | |||
279 | static int __videobuf_mmap_mapper(struct videobuf_queue *q, | 266 | static int __videobuf_mmap_mapper(struct videobuf_queue *q, |
280 | struct vm_area_struct *vma) | 267 | struct vm_area_struct *vma) |
281 | { | 268 | { |
@@ -424,7 +411,6 @@ static struct videobuf_qtype_ops qops = { | |||
424 | 411 | ||
425 | .alloc = __videobuf_alloc, | 412 | .alloc = __videobuf_alloc, |
426 | .iolock = __videobuf_iolock, | 413 | .iolock = __videobuf_iolock, |
427 | .mmap_free = __videobuf_mmap_free, | ||
428 | .mmap_mapper = __videobuf_mmap_mapper, | 414 | .mmap_mapper = __videobuf_mmap_mapper, |
429 | .video_copy_to_user = __videobuf_copy_to_user, | 415 | .video_copy_to_user = __videobuf_copy_to_user, |
430 | .copy_stream = __videobuf_copy_stream, | 416 | .copy_stream = __videobuf_copy_stream, |