提交 5e483075 编写于 作者: G Greg Kroah-Hartman

[PATCH] devfs: Remove the videodevice devfs_name field as it's no longer needed

Also fixes all drivers that set this field.
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
上级 ce7b0f46
...@@ -1570,8 +1570,7 @@ int video_register_device(struct video_device *vfd, int type, int nr) ...@@ -1570,8 +1570,7 @@ int video_register_device(struct video_device *vfd, int type, int nr)
vfd->class_dev.dev = vfd->dev; vfd->class_dev.dev = vfd->dev;
vfd->class_dev.class = &video_class; vfd->class_dev.class = &video_class;
vfd->class_dev.devt = MKDEV(VIDEO_MAJOR, vfd->minor); vfd->class_dev.devt = MKDEV(VIDEO_MAJOR, vfd->minor);
sprintf(vfd->devfs_name, "%s%d", name_base, i - base); sprintf(vfd->class_dev.class_id, "%s%d", name_base, i - base);
strlcpy(vfd->class_dev.class_id, vfd->devfs_name, BUS_ID_SIZE);
class_device_register(&vfd->class_dev); class_device_register(&vfd->class_dev);
class_device_create_file(&vfd->class_dev, class_device_create_file(&vfd->class_dev,
&class_device_attr_name); &class_device_attr_name);
......
...@@ -314,7 +314,6 @@ void *priv; ...@@ -314,7 +314,6 @@ void *priv;
/* for videodev.c intenal usage -- please don't touch */ /* for videodev.c intenal usage -- please don't touch */
int users; /* video_exclusive_{open|close} ... */ int users; /* video_exclusive_{open|close} ... */
struct mutex lock; /* ... helper function uses these */ struct mutex lock; /* ... helper function uses these */
char devfs_name[64]; /* devfs */
struct class_device class_dev; /* sysfs */ struct class_device class_dev; /* sysfs */
}; };
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册