diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2014-04-17 06:06:06 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-05-23 14:05:42 -0300 |
| commit | a00e68888d5d2b583b13d7d58204a27207af95fd (patch) | |
| tree | 61ffdf58d27c8e2f6bd5a69e989bbf5742a3e3c3 /drivers/media/pci/saa7134/saa7134.h | |
| parent | 5c44046da9e638cd7d8def8a9c8454f4d9ce8435 (diff) | |
| download | linux-stable-a00e68888d5d2b583b13d7d58204a27207af95fd.tar.gz linux-stable-a00e68888d5d2b583b13d7d58204a27207af95fd.tar.bz2 linux-stable-a00e68888d5d2b583b13d7d58204a27207af95fd.zip | |
[media] saa7134: move saa7134_pgtable to saa7134_dmaqueue
All dmaqueue's use saa7134_pgtable, so move it into struct saa7134_dmaqueue.
The videobuf_queue priv_data field now points to the dmaqueue struct.
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/saa7134/saa7134.h')
| -rw-r--r-- | drivers/media/pci/saa7134/saa7134.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/media/pci/saa7134/saa7134.h b/drivers/media/pci/saa7134/saa7134.h index 0548531796cf..d8c612aa65e0 100644 --- a/drivers/media/pci/saa7134/saa7134.h +++ b/drivers/media/pci/saa7134/saa7134.h @@ -460,9 +460,6 @@ struct saa7134_buf { int (*activate)(struct saa7134_dev *dev, struct saa7134_buf *buf, struct saa7134_buf *next); - - /* page tables */ - struct saa7134_pgtable *pt; }; struct saa7134_dmaqueue { @@ -471,6 +468,7 @@ struct saa7134_dmaqueue { struct list_head queue; struct timer_list timeout; unsigned int need_two; + struct saa7134_pgtable pt; }; /* video filehandle status */ @@ -517,7 +515,6 @@ struct saa7134_dmasound { /* ts/mpeg status */ struct saa7134_ts { /* TS capture */ - struct saa7134_pgtable pt_ts; int nr_packets; int nr_bufs; }; @@ -590,10 +587,8 @@ struct saa7134_dev { /* video+ts+vbi capture */ struct saa7134_dmaqueue video_q; - struct saa7134_pgtable pt_cap; struct videobuf_queue video_vbq; struct saa7134_dmaqueue vbi_q; - struct saa7134_pgtable pt_vbi; struct videobuf_queue vbi_vbq; unsigned int video_fieldcount; unsigned int vbi_fieldcount; |