aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx18/cx18-driver.h
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2011-03-12 04:35:33 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-03-22 15:38:03 -0400
commit0b5f265a88d89cbbf8abc42ca3311cb3219162ab (patch)
tree39fa5fb61e8ef8d56593d5582cc50f5831b6d34d /drivers/media/video/cx18/cx18-driver.h
parent6e29ad50b4d688b1d18e2d255e31676c7ee46d3d (diff)
[media] cx18: use v4l2_fh as preparation for adding core priority support
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx18/cx18-driver.h')
-rw-r--r--drivers/media/video/cx18/cx18-driver.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/media/video/cx18/cx18-driver.h b/drivers/media/video/cx18/cx18-driver.h
index de2457741e26..30a857473e54 100644
--- a/drivers/media/video/cx18/cx18-driver.h
+++ b/drivers/media/video/cx18/cx18-driver.h
@@ -50,6 +50,7 @@
50#include <media/v4l2-common.h> 50#include <media/v4l2-common.h>
51#include <media/v4l2-ioctl.h> 51#include <media/v4l2-ioctl.h>
52#include <media/v4l2-device.h> 52#include <media/v4l2-device.h>
53#include <media/v4l2-fh.h>
53#include <media/tuner.h> 54#include <media/tuner.h>
54#include <media/ir-kbd-i2c.h> 55#include <media/ir-kbd-i2c.h>
55#include "cx18-mailbox.h" 56#include "cx18-mailbox.h"
@@ -405,12 +406,23 @@ struct cx18_stream {
405}; 406};
406 407
407struct cx18_open_id { 408struct cx18_open_id {
409 struct v4l2_fh fh;
408 u32 open_id; 410 u32 open_id;
409 int type; 411 int type;
410 enum v4l2_priority prio; 412 enum v4l2_priority prio;
411 struct cx18 *cx; 413 struct cx18 *cx;
412}; 414};
413 415
416static inline struct cx18_open_id *fh2id(struct v4l2_fh *fh)
417{
418 return container_of(fh, struct cx18_open_id, fh);
419}
420
421static inline struct cx18_open_id *file2id(struct file *file)
422{
423 return fh2id(file->private_data);
424}
425
414/* forward declaration of struct defined in cx18-cards.h */ 426/* forward declaration of struct defined in cx18-cards.h */
415struct cx18_card; 427struct cx18_card;
416 428