aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/cx25821/cx25821.h
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-04-14 11:56:39 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-04-16 18:07:13 -0300
commit84293f0843931b13d8331093bafacd1d70dd5efb (patch)
tree5cc43ab7d463a478578c4ed89933013bb4a02247 /drivers/media/pci/cx25821/cx25821.h
parent2efe2cc4305ad9a8ea4db5881808c4db1c451091 (diff)
[media] cx25821: replace resource management functions with fh ownership
Just remember which filehandle is streaming instead of using complicated resource masks. After this patch we can replace cx25821_fh with v4l2_fh. 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.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/media/pci/cx25821/cx25821.h b/drivers/media/pci/cx25821/cx25821.h
index 06dadb5d9e56..128c9f320dfb 100644
--- a/drivers/media/pci/cx25821/cx25821.h
+++ b/drivers/media/pci/cx25821/cx25821.h
@@ -118,7 +118,6 @@ struct cx25821_tvnorm {
struct cx25821_fh {
struct cx25821_dev *dev;
- u32 resources;
enum v4l2_priority prio;
@@ -208,6 +207,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_ctrl_handler hdl;
@@ -219,8 +219,6 @@ struct cx25821_channel {
const struct sram_channel *sram_channels;
- int resources;
-
const struct cx25821_fmt *fmt;
unsigned int width, height;
int pixel_formats;
@@ -260,7 +258,6 @@ struct cx25821_dev {
char name[32];
/* Analog video */
- u32 resources;
unsigned int input;
v4l2_std_id tvnorm;
unsigned short _max_num_decoders;

Privacy Policy