Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e483075 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

[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: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ce7b0f46

drivers/media/video/videodev.c

+1 −2
Original line number Diff line number Diff line
@@ -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.class       = &video_class;

	vfd->class_dev.devt        = MKDEV(VIDEO_MAJOR, vfd->minor);

	sprintf(vfd->devfs_name, "%s%d", name_base, i - base);

	strlcpy(vfd->class_dev.class_id, vfd->devfs_name, BUS_ID_SIZE);

	sprintf(vfd->class_dev.class_id, "%s%d", name_base, i - base);

	class_device_register(&vfd->class_dev);

	class_device_create_file(&vfd->class_dev,

				&class_device_attr_name);

include/media/v4l2-dev.h

+0 −1
Original line number Diff line number Diff line
@@ -314,7 +314,6 @@ void *priv; 
	/* for videodev.c intenal usage -- please don't touch */

	int users;                     /* video_exclusive_{open|close} ... */

	struct mutex lock;             /* ... helper function uses these   */

	char devfs_name[64];           /* devfs */

	struct class_device class_dev; /* sysfs */

};