Commit 38ee04f0 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

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: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent a4366af4
...@@ -372,7 +372,7 @@ static struct video_device rtrack_radio= ...@@ -372,7 +372,7 @@ static struct video_device rtrack_radio=
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "RadioTrack radio", .name = "RadioTrack radio",
.type = VID_TYPE_TUNER, .type = VID_TYPE_TUNER,
.hardware = VID_HARDWARE_RTRACK, .hardware = 0,
.fops = &rtrack_fops, .fops = &rtrack_fops,
}; };
......
...@@ -328,7 +328,7 @@ static struct video_device aztech_radio= ...@@ -328,7 +328,7 @@ static struct video_device aztech_radio=
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "Aztech radio", .name = "Aztech radio",
.type = VID_TYPE_TUNER, .type = VID_TYPE_TUNER,
.hardware = VID_HARDWARE_AZTECH, .hardware = 0,
.fops = &aztech_fops, .fops = &aztech_fops,
}; };
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#define _V4L2_DEV_H #define _V4L2_DEV_H
#define OBSOLETE_OWNER 1 /* to be removed soon */ #define OBSOLETE_OWNER 1 /* to be removed soon */
#define OBSOLETE_DEVDATA 1 /* to be removed soon */
#include <linux/poll.h> #include <linux/poll.h>
#include <linux/fs.h> #include <linux/fs.h>
...@@ -338,8 +339,6 @@ extern int video_usercopy(struct inode *inode, struct file *file, ...@@ -338,8 +339,6 @@ extern int video_usercopy(struct inode *inode, struct file *file,
#ifdef CONFIG_VIDEO_V4L1_COMPAT #ifdef CONFIG_VIDEO_V4L1_COMPAT
#include <linux/mm.h> #include <linux/mm.h>
extern struct video_device* video_devdata(struct file*);
#define to_video_device(cd) container_of(cd, struct video_device, class_dev) #define to_video_device(cd) container_of(cd, struct video_device, class_dev)
static inline int static inline int
video_device_create_file(struct video_device *vfd, video_device_create_file(struct video_device *vfd,
...@@ -370,9 +369,14 @@ static inline void video_set_drvdata(struct video_device *dev, void *data) ...@@ -370,9 +369,14 @@ static inline void video_set_drvdata(struct video_device *dev, void *data)
{ {
dev->priv = data; dev->priv = data;
} }
#endif #endif
#ifdef OBSOLETE_DEVDATA /* to be removed soon */
/* Obsolete stuff - Still needed for radio devices and obsolete drivers */
extern struct video_device* video_devdata(struct file*);
extern int video_exclusive_open(struct inode *inode, struct file *file); extern int video_exclusive_open(struct inode *inode, struct file *file);
extern int video_exclusive_release(struct inode *inode, struct file *file); extern int video_exclusive_release(struct inode *inode, struct file *file);
#endif
#endif /* _V4L2_DEV_H */ #endif /* _V4L2_DEV_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment