aboutsummaryrefslogtreecommitdiff
path: root/include/media/v4l2-dev.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-06-05 10:26:32 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-06-25 02:05:05 -0300
commit5e87efa3b29c105f81fea785babafb098e4e046d (patch)
tree7782d36699174e5985ee7ddca3860df130b0bbbb /include/media/v4l2-dev.h
parent839e4a4acb90fd34e3f6765bef6fe03ee82dbc58 (diff)
V4L/DVB (4068): Removed all references to kernel stuff from videodev.h and videodev2.h
The videodev.h and videodev2.h describe the public API for V4L and V4L2. It shouldn't have there any kernel-specific stuff. Those were moved to v4l2-dev.h. This patch removes some uneeded headers and include v4l2-common.h on all V4L driver. This header includes device implementation of V4L2 API provided on v4l2-dev.h as well as V4L2 internal ioctls that provides connections between master driver and its i2c devices. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'include/media/v4l2-dev.h')
-rw-r--r--include/media/v4l2-dev.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index c2f54d2c9a4..dec6b24e4c4 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -40,8 +40,6 @@
#define VFL_TYPE_RADIO 2
#define VFL_TYPE_VTX 3
- const struct file_operations *fops;
-
/* Video standard functions */
extern unsigned int v4l2_video_std_fps(struct v4l2_standard *vs);
extern int v4l2_video_std_construct(struct v4l2_standard *vs,
@@ -92,7 +90,7 @@ struct v4l2_tvnorm {
struct video_device
{
/* device ops */
- struct file_operations *fops;
+ const struct file_operations *fops;
/* device info */
struct device *dev;
@@ -297,7 +295,7 @@ struct video_device
int (*vidioc_log_status) (struct file *file, void *fh);
-#if OBSOLETE_OWNER /* to be removed soon */
+#ifdef OBSOLETE_OWNER /* to be removed soon */
/* obsolete -- fops->owner is used instead */
struct module *owner;
/* dev->driver_data will be used instead some day.
@@ -351,7 +349,7 @@ video_device_remove_file(struct video_device *vfd,
class_device_remove_file(&vfd->class_dev, attr);
}
-#if OBSOLETE_OWNER /* to be removed soon */
+#ifdef OBSOLETE_OWNER /* to be removed soon */
/* helper functions to access driver private data. */
static inline void *video_get_drvdata(struct video_device *dev)
{