diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2010-05-11 09:36:30 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-08-02 14:21:45 -0400 |
commit | 952684035a91334dbe33b15063514cab5e7c6907 (patch) | |
tree | fbd82c8a9af67ab15369a1f120feafaa8836aa14 /drivers/media/video/cx23885/cx23885-core.c | |
parent | a438d6da52b991b6896742a0f9aed80c2f82da87 (diff) |
V4L/DVB: videobuf: Remove the videobuf_sg_dma_map/unmap functions
Instead of creating dirty wrappers around videobuf_dma_map/unmap that
create a dummy videobuf_queue structure, modify videobuf_dma_map/unmap
to take a device pointer argument and use it directly. The
videobuf_sg_dma_map/unmap then become unused and can be removed.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx23885/cx23885-core.c')
-rw-r--r-- | drivers/media/video/cx23885/cx23885-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c index 0dde57e96d30..161ae7316c95 100644 --- a/drivers/media/video/cx23885/cx23885-core.c +++ b/drivers/media/video/cx23885/cx23885-core.c | |||
@@ -1142,7 +1142,7 @@ void cx23885_free_buffer(struct videobuf_queue *q, struct cx23885_buffer *buf) | |||
1142 | 1142 | ||
1143 | BUG_ON(in_interrupt()); | 1143 | BUG_ON(in_interrupt()); |
1144 | videobuf_waiton(&buf->vb, 0, 0); | 1144 | videobuf_waiton(&buf->vb, 0, 0); |
1145 | videobuf_dma_unmap(q, dma); | 1145 | videobuf_dma_unmap(q->dev, dma); |
1146 | videobuf_dma_free(dma); | 1146 | videobuf_dma_free(dma); |
1147 | btcx_riscmem_free(to_pci_dev(q->dev), &buf->risc); | 1147 | btcx_riscmem_free(to_pci_dev(q->dev), &buf->risc); |
1148 | buf->vb.state = VIDEOBUF_NEEDS_INIT; | 1148 | buf->vb.state = VIDEOBUF_NEEDS_INIT; |