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

[Greg KH <gregkh@suse.de>]

[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>

---
commit 4a8c1e81ac1235c3861c0ab6c4bad960e945c451
tree 25a7ea27febb952a02df8e79030cac8aeb8a7331
parent 87656ce7a691bebc4ed9fb68cdd931ff9223fc9f
author Greg Kroah-Hartman <gregkh@suse.de> Mon, 20 Jun 2005 21:15:16 -0700
committer Greg Kroah-Hartman <gregkh@suse.de> Mon, 20 Jun 2005 23:13:38 -0700

 drivers/media/video/videodev.c |    3 +--
 include/linux/videodev.h       |    1 -
 2 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c
--- a/drivers/media/video/videodev.c
+++ b/drivers/media/video/videodev.c
@@ -336,8 +336,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);
diff --git a/include/linux/videodev.h b/include/linux/videodev.h
--- a/include/linux/videodev.h
+++ b/include/linux/videodev.h
@@ -42,7 +42,6 @@ struct video_device
 	/* for videodev.c intenal usage -- please don't touch */
 	int users;                     /* video_exclusive_{open|close} ... */
 	struct semaphore lock;         /* ... helper function uses these   */
-	char devfs_name[64];           /* devfs */
 	struct class_device class_dev; /* sysfs */
 };
 

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/