summaryrefslogtreecommitdiff
path: root/include/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-10-08 18:43:49 +0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-10-10 07:03:10 +0400
commit5ddff43435394c1c2540fcdeed00cb54862c31bf (patch)
treedc61fc71d81cecbf2fe515da60760e94a8bc6f5c /include/media
parent7568e3ce6710cb2c1bc1564a273e9f222efbc95e (diff)
downloadlinux-5ddff43435394c1c2540fcdeed00cb54862c31bf.tar.xz
V4L/DVB (6290): remove videobuf_set_pci_ops
Before the videobuf redesign, a procedure for re-using videobuf without PCI scatter/gather where provided by changing the pci-dependent operations by other operations. With the newer approach, those methods are obsolete and can safelly be removed. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/videobuf-core.h3
-rw-r--r--include/media/videobuf-dma-sg.h19
2 files changed, 0 insertions, 22 deletions
diff --git a/include/media/videobuf-core.h b/include/media/videobuf-core.h
index 96949e31eaf8..9bae5a2eda66 100644
--- a/include/media/videobuf-core.h
+++ b/include/media/videobuf-core.h
@@ -173,9 +173,6 @@ struct videobuf_queue {
/* driver private data */
void *priv_data;
-
- /*FIXME: should be removed after completing the vb conversion */
- void *priv_ops;
};
int videobuf_waiton(struct videobuf_buffer *vb, int non_blocking, int intr);
diff --git a/include/media/videobuf-dma-sg.h b/include/media/videobuf-dma-sg.h
index 206d9027b39f..38105031db23 100644
--- a/include/media/videobuf-dma-sg.h
+++ b/include/media/videobuf-dma-sg.h
@@ -89,19 +89,6 @@ struct videbuf_pci_sg_memory
struct videobuf_dmabuf dma;
};
-/* FIXME: To be removed soon */
-typedef int (vb_map_sg_t)(void *dev, struct scatterlist *sglist, int nr_pages,
- int direction);
-
-/* FIXME: To be removed soon */
-struct videobuf_dma_sg_ops
-{
- vb_map_sg_t *vb_map_sg;
- vb_map_sg_t *vb_dma_sync_sg;
- vb_map_sg_t *vb_unmap_sg;
-
-};
-
void videobuf_dma_init(struct videobuf_dmabuf *dma);
int videobuf_dma_init_user(struct videobuf_dmabuf *dma, int direction,
unsigned long data, unsigned long size);
@@ -133,9 +120,3 @@ void videobuf_queue_pci_init(struct videobuf_queue* q,
int videobuf_pci_dma_map(struct pci_dev *pci,struct videobuf_dmabuf *dma);
int videobuf_pci_dma_unmap(struct pci_dev *pci,struct videobuf_dmabuf *dma);
-/* FIXME: temporary routine for vivi and tm6000, while lacking implementation
- * of videobuf-vmalloc
- */
-void videobuf_set_pci_ops (struct videobuf_queue* q,
- struct videobuf_dma_sg_ops *ops);
-