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-sg.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-sg.c')
-rw-r--r-- | drivers/media/video/videobuf-dma-sg.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/drivers/media/video/videobuf-dma-sg.c b/drivers/media/video/videobuf-dma-sg.c index c9d946a388e8..7ff275e30092 100644 --- a/drivers/media/video/videobuf-dma-sg.c +++ b/drivers/media/video/videobuf-dma-sg.c | |||
@@ -548,20 +548,6 @@ static int __videobuf_sync(struct videobuf_queue *q, | |||
548 | return videobuf_dma_sync(q, &mem->dma); | 548 | return videobuf_dma_sync(q, &mem->dma); |
549 | } | 549 | } |
550 | 550 | ||
551 | static int __videobuf_mmap_free(struct videobuf_queue *q) | ||
552 | { | ||
553 | int i; | ||
554 | |||
555 | for (i = 0; i < VIDEO_MAX_FRAME; i++) { | ||
556 | if (q->bufs[i]) { | ||
557 | if (q->bufs[i]->map) | ||
558 | return -EBUSY; | ||
559 | } | ||
560 | } | ||
561 | |||
562 | return 0; | ||
563 | } | ||
564 | |||
565 | static int __videobuf_mmap_mapper(struct videobuf_queue *q, | 551 | static int __videobuf_mmap_mapper(struct videobuf_queue *q, |
566 | struct vm_area_struct *vma) | 552 | struct vm_area_struct *vma) |
567 | { | 553 | { |
@@ -711,7 +697,6 @@ static struct videobuf_qtype_ops sg_ops = { | |||
711 | .alloc = __videobuf_alloc, | 697 | .alloc = __videobuf_alloc, |
712 | .iolock = __videobuf_iolock, | 698 | .iolock = __videobuf_iolock, |
713 | .sync = __videobuf_sync, | 699 | .sync = __videobuf_sync, |
714 | .mmap_free = __videobuf_mmap_free, | ||
715 | .mmap_mapper = __videobuf_mmap_mapper, | 700 | .mmap_mapper = __videobuf_mmap_mapper, |
716 | .video_copy_to_user = __videobuf_copy_to_user, | 701 | .video_copy_to_user = __videobuf_copy_to_user, |
717 | .copy_stream = __videobuf_copy_stream, | 702 | .copy_stream = __videobuf_copy_stream, |