From foo@baz.org Sun Jun 5 14:33:21 2005 Date: Mon, 20 Jun 2005 21:15:16 -0700 To: Greg KH From: Greg Kroah-Hartman Subject: 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 --- drivers/media/video/videodev.c | 3 +-- include/linux/videodev2.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) --- gregkh-2.6.orig/drivers/media/video/videodev.c +++ gregkh-2.6/drivers/media/video/videodev.c @@ -331,8 +331,7 @@ int video_register_device(struct video_d 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); --- gregkh-2.6.orig/include/linux/videodev2.h +++ gregkh-2.6/include/linux/videodev2.h @@ -92,7 +92,6 @@ struct video_device /* 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 */ };