aboutsummaryrefslogtreecommitdiffstats
path: root/include/media/v4l2-dev.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-06-05 09:26:32 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-06-25 01:05:05 -0400
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 c2f54d2c9a4c..dec6b24e4c42 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -40,8 +40,6 @@
40#define VFL_TYPE_RADIO 2 40#define VFL_TYPE_RADIO 2
41#define VFL_TYPE_VTX 3 41#define VFL_TYPE_VTX 3
42 42
43 const struct file_operations *fops;
44
45/* Video standard functions */ 43/* Video standard functions */
46extern unsigned int v4l2_video_std_fps(struct v4l2_standard *vs); 44extern unsigned int v4l2_video_std_fps(struct v4l2_standard *vs);
47extern int v4l2_video_std_construct(struct v4l2_standard *vs, 45extern int v4l2_video_std_construct(struct v4l2_standard *vs,
@@ -92,7 +90,7 @@ struct v4l2_tvnorm {
92struct video_device 90struct video_device
93{ 91{
94 /* device ops */ 92 /* device ops */
95 struct file_operations *fops; 93 const struct file_operations *fops;
96 94
97 /* device info */ 95 /* device info */
98 struct device *dev; 96 struct device *dev;
@@ -297,7 +295,7 @@ struct video_device
297 int (*vidioc_log_status) (struct file *file, void *fh); 295 int (*vidioc_log_status) (struct file *file, void *fh);
298 296
299 297
300#if OBSOLETE_OWNER /* to be removed soon */ 298#ifdef OBSOLETE_OWNER /* to be removed soon */
301/* obsolete -- fops->owner is used instead */ 299/* obsolete -- fops->owner is used instead */
302struct module *owner; 300struct module *owner;
303/* dev->driver_data will be used instead some day. 301/* dev->driver_data will be used instead some day.
@@ -351,7 +349,7 @@ video_device_remove_file(struct video_device *vfd,
351 class_device_remove_file(&vfd->class_dev, attr); 349 class_device_remove_file(&vfd->class_dev, attr);
352} 350}
353 351
354#if OBSOLETE_OWNER /* to be removed soon */ 352#ifdef OBSOLETE_OWNER /* to be removed soon */
355/* helper functions to access driver private data. */ 353/* helper functions to access driver private data. */
356static inline void *video_get_drvdata(struct video_device *dev) 354static inline void *video_get_drvdata(struct video_device *dev)
357{ 355{