diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-09-27 18:25:44 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-10 00:02:55 -0300 |
| commit | 851c0c96b2212f48fe51afc1589541b5eae3a544 (patch) | |
| tree | 0ec4d6019033242fb75e717ca05c1f04d2eca934 /include/media | |
| parent | cd4765efdd816ac14075fc7d5adf489502e75e1e (diff) | |
| download | linux-851c0c96b2212f48fe51afc1589541b5eae3a544.tar.bz2 | |
V4L/DVB (6266): videobuf cleanup: mmap check is common to all videobuf. Make it at core
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
http://thread.gmane.org/gmane.comp.video.video4linux/34978/focus=34981
Reviewed-by: Ricardo Cerqueira <v4l@cerqueira.org>
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/videobuf-core.h | 4 | ||||
| -rw-r--r-- | include/media/videobuf-dma-sg.h | 1 | ||||
| -rw-r--r-- | include/media/videobuf-vmalloc.h | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/include/media/videobuf-core.h b/include/media/videobuf-core.h index 0ac21ae44f69..96949e31eaf8 100644 --- a/include/media/videobuf-core.h +++ b/include/media/videobuf-core.h @@ -97,6 +97,9 @@ struct videobuf_buffer { /* buffer addr (userland ptr!) */ unsigned long baddr; + /* for mmap'ed buffers */ + struct videobuf_mapping *map; + /* Private pointer to allow specific methods to store their data */ int privsize; void *priv; @@ -143,7 +146,6 @@ struct videobuf_qtype_ops { int (*mmap_free) (struct videobuf_queue *q); int (*mmap_mapper) (struct videobuf_queue *q, struct vm_area_struct *vma); - int (*is_mmapped) (struct videobuf_buffer *buf); }; struct videobuf_queue { diff --git a/include/media/videobuf-dma-sg.h b/include/media/videobuf-dma-sg.h index 62a3709905f3..206d9027b39f 100644 --- a/include/media/videobuf-dma-sg.h +++ b/include/media/videobuf-dma-sg.h @@ -86,7 +86,6 @@ struct videbuf_pci_sg_memory u32 magic; /* for mmap'ed buffers */ - struct videobuf_mapping *map; struct videobuf_dmabuf dma; }; diff --git a/include/media/videobuf-vmalloc.h b/include/media/videobuf-vmalloc.h index 5fff68df6689..26a8958d23d1 100644 --- a/include/media/videobuf-vmalloc.h +++ b/include/media/videobuf-vmalloc.h @@ -21,9 +21,6 @@ struct videbuf_vmalloc_memory { u32 magic; - /* for mmap'ed buffers */ - struct videobuf_mapping *map; - void *vmalloc; /* remap_vmalloc_range seems to need to run after mmap() on some cases */ |