aboutsummaryrefslogtreecommitdiffstats
path: root/include/media/v4l2-dev.h
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-07-21 06:51:45 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-26 11:55:07 -0400
commit9c39d7eafa366b807067697f7fc5b14d8b865179 (patch)
tree52442a49ab95ed1c3495a398ad6b271d6c65f1b9 /include/media/v4l2-dev.h
parenta399810ca69d9d4bd30ab8c1678c7439e567f90b (diff)
V4L/DVB (8483): Remove obsolete owner field from video_device struct.
According to an old comment this should have been removed in 2.6.15. Better late than never... Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'include/media/v4l2-dev.h')
-rw-r--r--include/media/v4l2-dev.h20
1 files changed, 7 insertions, 13 deletions
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index d9149cd25b31..ae2b1e6bdf47 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -9,7 +9,6 @@
9#ifndef _V4L2_DEV_H 9#ifndef _V4L2_DEV_H
10#define _V4L2_DEV_H 10#define _V4L2_DEV_H
11 11
12#define OBSOLETE_OWNER 1 /* to be removed soon */
13#define OBSOLETE_DEVDATA 1 /* to be removed soon */ 12#define OBSOLETE_DEVDATA 1 /* to be removed soon */
14 13
15#include <linux/poll.h> 14#include <linux/poll.h>
@@ -76,14 +75,12 @@ struct video_device
76 /* ioctl callbacks */ 75 /* ioctl callbacks */
77 const struct v4l2_ioctl_ops *ioctl_ops; 76 const struct v4l2_ioctl_ops *ioctl_ops;
78 77
79#ifdef OBSOLETE_OWNER /* to be removed soon */ 78#ifdef OBSOLETE_DEVDATA /* to be removed soon */
80/* obsolete -- fops->owner is used instead */ 79 /* dev->driver_data will be used instead some day.
81struct module *owner; 80 * Use the video_{get|set}_drvdata() helper functions,
82/* dev->driver_data will be used instead some day. 81 * so the switch over will be transparent for you.
83 * Use the video_{get|set}_drvdata() helper functions, 82 * Or use {pci|usb}_{get|set}_drvdata() directly. */
84 * so the switch over will be transparent for you. 83 void *priv;
85 * Or use {pci|usb}_{get|set}_drvdata() directly. */
86void *priv;
87#endif 84#endif
88 85
89 /* for videodev.c intenal usage -- please don't touch */ 86 /* for videodev.c intenal usage -- please don't touch */
@@ -126,7 +123,7 @@ video_device_remove_file(struct video_device *vfd,
126 123
127#endif /* CONFIG_VIDEO_V4L1_COMPAT */ 124#endif /* CONFIG_VIDEO_V4L1_COMPAT */
128 125
129#ifdef OBSOLETE_OWNER /* to be removed soon */ 126#ifdef OBSOLETE_DEVDATA /* to be removed soon */
130/* helper functions to access driver private data. */ 127/* helper functions to access driver private data. */
131static inline void *video_get_drvdata(struct video_device *dev) 128static inline void *video_get_drvdata(struct video_device *dev)
132{ 129{
@@ -138,9 +135,6 @@ static inline void video_set_drvdata(struct video_device *dev, void *data)
138 dev->priv = data; 135 dev->priv = data;
139} 136}
140 137
141#endif
142
143#ifdef OBSOLETE_DEVDATA /* to be removed soon */
144/* Obsolete stuff - Still needed for radio devices and obsolete drivers */ 138/* Obsolete stuff - Still needed for radio devices and obsolete drivers */
145extern struct video_device* video_devdata(struct file*); 139extern struct video_device* video_devdata(struct file*);
146extern int video_exclusive_open(struct inode *inode, struct file *file); 140extern int video_exclusive_open(struct inode *inode, struct file *file);