aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2005-06-21 00:15:16 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2006-06-26 15:25:08 -0400
commit5e483075a1f9862a65af648d1d939499969c7b5d (patch)
treea510b8051e026ccf3fdbcff437cbe724700c96bf /drivers/media
parentce7b0f46bbf4bff8daab2dd3d878b9e72a623d09 (diff)
[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>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/videodev.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c
index a802a7e0df79..b26ebaff226f 100644
--- a/drivers/media/video/videodev.c
+++ b/drivers/media/video/videodev.c
@@ -1570,8 +1570,7 @@ int video_register_device(struct video_device *vfd, int type, int nr)
1570 vfd->class_dev.dev = vfd->dev; 1570 vfd->class_dev.dev = vfd->dev;
1571 vfd->class_dev.class = &video_class; 1571 vfd->class_dev.class = &video_class;
1572 vfd->class_dev.devt = MKDEV(VIDEO_MAJOR, vfd->minor); 1572 vfd->class_dev.devt = MKDEV(VIDEO_MAJOR, vfd->minor);
1573 sprintf(vfd->devfs_name, "%s%d", name_base, i - base); 1573 sprintf(vfd->class_dev.class_id, "%s%d", name_base, i - base);
1574 strlcpy(vfd->class_dev.class_id, vfd->devfs_name, BUS_ID_SIZE);
1575 class_device_register(&vfd->class_dev); 1574 class_device_register(&vfd->class_dev);
1576 class_device_create_file(&vfd->class_dev, 1575 class_device_create_file(&vfd->class_dev,
1577 &class_device_attr_name); 1576 &class_device_attr_name);