summaryrefslogtreecommitdiff
path: root/linux/include
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-10-08 11:43:49 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-10-08 11:43:49 -0300
commited125248d5e3b3b468befa39596c4bf7fb66fb0c (patch)
treeef6e0e0fc27814bd20f5a210756edd4ed85fe702 /linux/include
parentacd993ba502f745b63b89ef1101e978a103f52e6 (diff)
downloadmediapointer-dvb-s2-ed125248d5e3b3b468befa39596c4bf7fb66fb0c.tar.gz
mediapointer-dvb-s2-ed125248d5e3b3b468befa39596c4bf7fb66fb0c.tar.bz2
remove videobuf_set_pci_ops
From: Mauro Carvalho Chehab <mchehab@infradead.org> 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 'linux/include')
-rw-r--r--linux/include/media/videobuf-core.h3
-rw-r--r--linux/include/media/videobuf-dma-sg.h19
2 files changed, 0 insertions, 22 deletions
diff --git a/linux/include/media/videobuf-core.h b/linux/include/media/videobuf-core.h
index cf0759cb2..6e67c2c26 100644
--- a/linux/include/media/videobuf-core.h
+++ b/linux/include/media/videobuf-core.h
@@ -177,9 +177,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/linux/include/media/videobuf-dma-sg.h b/linux/include/media/videobuf-dma-sg.h
index 206d9027b..38105031d 100644
--- a/linux/include/media/videobuf-dma-sg.h
+++ b/linux/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);
-