diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-04-14 16:57:18 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-04-16 23:07:43 +0200 |
| commit | 8d125c507dee259d12299c9eb6e8d32ac1f8ae6d (patch) | |
| tree | cd5091c214c6d1042a293869d417ef53d2958058 /drivers/media/pci/cx25821/cx25821.h | |
| parent | [media] cx25821: replace resource management functions with fh ownership (diff) | |
| download | linux-8d125c507dee259d12299c9eb6e8d32ac1f8ae6d.tar.xz linux-8d125c507dee259d12299c9eb6e8d32ac1f8ae6d.zip | |
[media] cx25821: switch to v4l2_fh, add event and prio handling
It is now possible to remove cx25821_fh and replace it with v4l2_fh,
which in turn makes event handling and core prio handling possible.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/pci/cx25821/cx25821.h')
| -rw-r--r-- | drivers/media/pci/cx25821/cx25821.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/media/pci/cx25821/cx25821.h b/drivers/media/pci/cx25821/cx25821.h index 128c9f320dfb..40b16b01349b 100644 --- a/drivers/media/pci/cx25821/cx25821.h +++ b/drivers/media/pci/cx25821/cx25821.h @@ -116,15 +116,6 @@ struct cx25821_tvnorm { u32 cxoformat; }; -struct cx25821_fh { - struct cx25821_dev *dev; - - enum v4l2_priority prio; - - /* video capture */ - int channel_id; -}; - enum cx25821_itype { CX25821_VMUX_COMPOSITE = 1, CX25821_VMUX_SVIDEO, @@ -207,8 +198,7 @@ struct cx25821_dev; struct cx25821_channel { unsigned id; struct cx25821_dev *dev; - struct cx25821_fh *streaming_fh; - struct v4l2_prio_state prio; + struct v4l2_fh *streaming_fh; struct v4l2_ctrl_handler hdl; struct cx25821_data timeout_data; @@ -360,7 +350,6 @@ struct cx25821_dev { int pixel_format; int channel_select; int command; - int channel_opened; }; struct upstream_user_struct { |