Selaa lähdekoodia

[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: Greg Kroah-Hartman <gregkh@suse.de>
Greg Kroah-Hartman 20 vuotta sitten
vanhempi
commit
5e483075a1
2 muutettua tiedostoa jossa 1 lisäystä ja 3 poistoa
  1. 1 2
      drivers/media/video/videodev.c
  2. 0 1
      include/media/v4l2-dev.h

+ 1 - 2
drivers/media/video/videodev.c

@@ -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);

+ 0 - 1
include/media/v4l2-dev.h

@@ -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 */
 };