summaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/cx23885/cx23885.h
diff options
context:
space:
mode:
authorHans Verkuil2014-04-23 13:27:00 +0200
committerMauro Carvalho Chehab2014-09-03 12:56:36 +0200
commit9529a4b0cf49163e489446ec159a2dfb64f78df8 (patch)
tree272defb1e66607c555ab56f199e802da9d8e2e5a /drivers/media/pci/cx23885/cx23885.h
parent[media] cx23885: fmt, width and height are global, not per-fh (diff)
downloadkernel-qcow2-linux-9529a4b0cf49163e489446ec159a2dfb64f78df8.tar.gz
kernel-qcow2-linux-9529a4b0cf49163e489446ec159a2dfb64f78df8.tar.xz
kernel-qcow2-linux-9529a4b0cf49163e489446ec159a2dfb64f78df8.zip
[media] cx23885: drop videobuf abuse in cx23885-alsa
The alsa driver uses videobuf low-level functions that are not available in vb2, so replace them by driver-specific functions. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/pci/cx23885/cx23885.h')
-rw-r--r--drivers/media/pci/cx23885/cx23885.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/media/pci/cx23885/cx23885.h b/drivers/media/pci/cx23885/cx23885.h
index 260d17712ab4..9cd2b1b31cec 100644
--- a/drivers/media/pci/cx23885/cx23885.h
+++ b/drivers/media/pci/cx23885/cx23885.h
@@ -324,7 +324,10 @@ struct cx23885_kernel_ir {
struct cx23885_audio_buffer {
unsigned int bpl;
struct btcx_riscmem risc;
- struct videobuf_dmabuf dma;
+ void *vaddr;
+ struct scatterlist *sglist;
+ int sglen;
+ int nr_pages;
};
struct cx23885_audio_dev {
@@ -342,8 +345,6 @@ struct cx23885_audio_dev {
unsigned int period_size;
unsigned int num_periods;
- struct videobuf_dmabuf *dma_risc;
-
struct cx23885_audio_buffer *buf;
struct snd_pcm_substream *substream;