diff options
| author | Hans Verkuil | 2014-04-23 12:52:07 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2014-09-03 12:55:24 +0200 |
| commit | 91d2d6745205774b712727ede2a35c91e1eb4c48 (patch) | |
| tree | 4908ff7074be917640227d2a4c8c64c6fceee062 /drivers/media/pci/cx23885/cx23885.h | |
| parent | [media] cx23885: drop unused clip fields from struct cx23885_fh (diff) | |
| download | kernel-qcow2-linux-91d2d6745205774b712727ede2a35c91e1eb4c48.tar.gz kernel-qcow2-linux-91d2d6745205774b712727ede2a35c91e1eb4c48.tar.xz kernel-qcow2-linux-91d2d6745205774b712727ede2a35c91e1eb4c48.zip | |
[media] cx23885: fmt, width and height are global, not per-fh
Move these fields from cx23885_fh to cx23885_dev.
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.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/pci/cx23885/cx23885.h b/drivers/media/pci/cx23885/cx23885.h index a88e951a91b8..260d17712ab4 100644 --- a/drivers/media/pci/cx23885/cx23885.h +++ b/drivers/media/pci/cx23885/cx23885.h @@ -145,10 +145,6 @@ struct cx23885_fh { struct cx23885_dev *dev; u32 resources; - /* video capture */ - struct cx23885_fmt *fmt; - unsigned int width, height; - /* vbi capture */ struct videobuf_queue vidq; struct videobuf_queue vbiq; @@ -424,6 +420,10 @@ struct cx23885_dev { struct video_device *video_dev; struct video_device *vbi_dev; + /* video capture */ + struct cx23885_fmt *fmt; + unsigned int width, height; + struct cx23885_dmaqueue vidq; struct cx23885_dmaqueue vbiq; spinlock_t slock; |