aboutsummaryrefslogtreecommitdiffstats
path: root/include/media/v4l2-dev.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-08-08 08:10:01 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-09-26 10:52:53 -0400
commit38ee04f04340ffd6af868499862341d11ed2b331 (patch)
treecb8c4a7336cb3dc89f4ff6a46fab706ea3603b76 /include/media/v4l2-dev.h
parenta4366af40d7d2021499b84b8311336c944a9a71c (diff)
V4L/DVB (4348): Fix: compile for radio aimslab and aztech with V4L2 only
All radio devices use an obsolete mode of opening/release driver. Since this is not V4L1 core, better to keep the method available for more time than to rewrite open/release without a radio device to test, since the newer method is much more complex than the previous one (although providing support for multiple opens and multiple 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.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index 810462f8a374..c12d72d5f008 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -9,7 +9,8 @@
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 */ 12#define OBSOLETE_OWNER 1 /* to be removed soon */
13#define OBSOLETE_DEVDATA 1 /* to be removed soon */
13 14
14#include <linux/poll.h> 15#include <linux/poll.h>
15#include <linux/fs.h> 16#include <linux/fs.h>
@@ -338,8 +339,6 @@ extern int video_usercopy(struct inode *inode, struct file *file,
338#ifdef CONFIG_VIDEO_V4L1_COMPAT 339#ifdef CONFIG_VIDEO_V4L1_COMPAT
339#include <linux/mm.h> 340#include <linux/mm.h>
340 341
341extern struct video_device* video_devdata(struct file*);
342
343#define to_video_device(cd) container_of(cd, struct video_device, class_dev) 342#define to_video_device(cd) container_of(cd, struct video_device, class_dev)
344static inline int 343static inline int
345video_device_create_file(struct video_device *vfd, 344video_device_create_file(struct video_device *vfd,
@@ -370,9 +369,14 @@ static inline void video_set_drvdata(struct video_device *dev, void *data)
370{ 369{
371 dev->priv = data; 370 dev->priv = data;
372} 371}
372
373#endif 373#endif
374 374
375#ifdef OBSOLETE_DEVDATA /* to be removed soon */
376/* Obsolete stuff - Still needed for radio devices and obsolete drivers */
377extern struct video_device* video_devdata(struct file*);
375extern int video_exclusive_open(struct inode *inode, struct file *file); 378extern int video_exclusive_open(struct inode *inode, struct file *file);
376extern int video_exclusive_release(struct inode *inode, struct file *file); 379extern int video_exclusive_release(struct inode *inode, struct file *file);
380#endif
377 381
378#endif /* _V4L2_DEV_H */ 382#endif /* _V4L2_DEV_H */