summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorGreg Kroah-Hartman2005-06-21 06:15:16 +0200
committerGreg Kroah-Hartman2006-06-26 21:25:08 +0200
commit5e483075a1f9862a65af648d1d939499969c7b5d (patch)
treea510b8051e026ccf3fdbcff437cbe724700c96bf /drivers/media
parent[PATCH] devfs: Remove the gendisk devfs_name field as it's no longer needed (diff)
downloadkernel-qcow2-linux-5e483075a1f9862a65af648d1d939499969c7b5d.tar.gz
kernel-qcow2-linux-5e483075a1f9862a65af648d1d939499969c7b5d.tar.xz
kernel-qcow2-linux-5e483075a1f9862a65af648d1d939499969c7b5d.zip
[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)
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);