summaryrefslogtreecommitdiffstats
path: root/include/media/v4l2-dev.h
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-07-20 06:35:02 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-23 16:42:52 -0300
commit22a04f106346c3af019135f2de3cabf9ac41c3ba (patch)
tree520b5260c3883f153cb55192f7df92899fbd062e /include/media/v4l2-dev.h
parent5e85e732f0ed56aa97a3ba26ac2b93ffe597a208 (diff)
downloadlinux-22a04f106346c3af019135f2de3cabf9ac41c3ba.tar.bz2
V4L/DVB (8429): videodev: renamed 'class_dev' to 'dev'
The class_dev field is a normal device, not a class device. This is very confusing and now that the old 'dev' field has been renamed to 'parent' we can rename 'class_dev' to just 'dev'. 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.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index 5ae261fbcb7e..185372ffa270 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -88,18 +88,18 @@ struct video_device
const struct file_operations *fops;
/* sysfs */
- struct device class_dev; /* v4l device */
+ struct device dev; /* v4l device */
struct device *parent; /* device parent */
/* device info */
char name[32];
- int type; /* v4l1 */
- int type2; /* v4l2 */
+ int type; /* v4l1 */
+ int type2; /* v4l2 */
int minor;
/* attribute to diferentiate multiple indexs on one physical device */
int index;
- int debug; /* Activates debug level*/
+ int debug; /* Activates debug level*/
/* Video standard vars */
v4l2_std_id tvnorms; /* Supported tv norms */
@@ -345,7 +345,7 @@ void *priv;
};
/* Class-dev to video-device */
-#define to_video_device(cd) container_of(cd, struct video_device, class_dev)
+#define to_video_device(cd) container_of(cd, struct video_device, dev)
/* Version 2 functions */
extern int video_register_device(struct video_device *vfd, int type, int nr);
@@ -373,7 +373,7 @@ static inline int __must_check
video_device_create_file(struct video_device *vfd,
struct device_attribute *attr)
{
- int ret = device_create_file(&vfd->class_dev, attr);
+ int ret = device_create_file(&vfd->dev, attr);
if (ret < 0)
printk(KERN_WARNING "%s error: %d\n", __func__, ret);
return ret;
@@ -382,7 +382,7 @@ static inline void
video_device_remove_file(struct video_device *vfd,
struct device_attribute *attr)
{
- device_remove_file(&vfd->class_dev, attr);
+ device_remove_file(&vfd->dev, attr);
}
#endif /* CONFIG_VIDEO_V4L1_COMPAT */