diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2011-10-12 04:36:04 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-01-16 07:00:10 -0500 |
commit | 61bb725ef5a646d3fc8a64e41b020a65542cdae1 (patch) | |
tree | 5f35434d19ea58ae4ae32c5218bbdd43916978c4 /drivers/media/video/ivtv/ivtv-driver.h | |
parent | cdc037817cc15caf931cd3476970860d62f1985c (diff) |
[media] ivtv: remove open_id/id from the filehandle code
Instead of messing around with id's it's much easier to just compare
against a filehandle pointer.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Andy Walls <awalls@md.metrocast.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-driver.h')
-rw-r--r-- | drivers/media/video/ivtv/ivtv-driver.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/ivtv/ivtv-driver.h b/drivers/media/video/ivtv/ivtv-driver.h index 8f9cc17b518..06f3d78389b 100644 --- a/drivers/media/video/ivtv/ivtv-driver.h +++ b/drivers/media/video/ivtv/ivtv-driver.h | |||
@@ -332,7 +332,7 @@ struct ivtv_stream { | |||
332 | const char *name; /* name of the stream */ | 332 | const char *name; /* name of the stream */ |
333 | int type; /* stream type */ | 333 | int type; /* stream type */ |
334 | 334 | ||
335 | u32 id; | 335 | struct v4l2_fh *fh; /* pointer to the streaming filehandle */ |
336 | spinlock_t qlock; /* locks access to the queues */ | 336 | spinlock_t qlock; /* locks access to the queues */ |
337 | unsigned long s_flags; /* status flags, see above */ | 337 | unsigned long s_flags; /* status flags, see above */ |
338 | int dma; /* can be PCI_DMA_TODEVICE, PCI_DMA_FROMDEVICE or PCI_DMA_NONE */ | 338 | int dma; /* can be PCI_DMA_TODEVICE, PCI_DMA_FROMDEVICE or PCI_DMA_NONE */ |
@@ -379,7 +379,6 @@ struct ivtv_stream { | |||
379 | 379 | ||
380 | struct ivtv_open_id { | 380 | struct ivtv_open_id { |
381 | struct v4l2_fh fh; | 381 | struct v4l2_fh fh; |
382 | u32 open_id; /* unique ID for this file descriptor */ | ||
383 | int type; /* stream type */ | 382 | int type; /* stream type */ |
384 | int yuv_frames; /* 1: started OUT_UDMA_YUV output mode */ | 383 | int yuv_frames; /* 1: started OUT_UDMA_YUV output mode */ |
385 | struct ivtv *itv; | 384 | struct ivtv *itv; |