[PATCH] devfs: Remove devfs_mk_cdev() function from the kernel tree

Removes the devfs_mk_cdev() function and all callers of it.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

2 files changed, 2 insertions, 9 deletions

diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c
index cf78a72320e5..8e926d98bd92 100644
--- a/drivers/media/dvb/dvb-core/dvbdev.c
+++ b/drivers/media/dvb/dvb-core/dvbdev.c
@@ -231,10 +231,6 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
 
         mutex_unlock(&dvbdev_register_lock);
 
-        devfs_mk_cdev(MKDEV(DVB_MAJOR, nums2minor(adap->num, type, id)),
-                        S_IFCHR | S_IRUSR | S_IWUSR,
-                        "dvb/adapter%d/%s%d", adap->num, dnames[type], id);
-
         class_device_create(dvb_class, NULL, MKDEV(DVB_MAJOR, nums2minor(adap->num, type, id)),
                             adap->device, "dvb%d.%s%d", adap->num, dnames[type], id);
 
diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c
index 2dfa7f23d0ca..cc67ee952838 100644
--- a/drivers/media/video/videodev.c
+++ b/drivers/media/video/videodev.c
@@ -1563,10 +1563,6 @@ int video_register_device(struct video_device *vfd, int type, int nr)
         video_device[i]=vfd;
         vfd->minor=i;
         mutex_unlock(&videodev_lock);
-
-        sprintf(vfd->devfs_name, "v4l/%s%d", name_base, i - base);
-        devfs_mk_cdev(MKDEV(VIDEO_MAJOR, vfd->minor),
-                        S_IFCHR | S_IRUSR | S_IWUSR, vfd->devfs_name);
         mutex_init(&vfd->lock);
 
         /* sysfs class */
@@ -1575,7 +1571,8 @@ 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);
-        strlcpy(vfd->class_dev.class_id, vfd->devfs_name + 4, BUS_ID_SIZE);
+        sprintf(vfd->devfs_name, "%s%d", name_base, i - base);
+        strlcpy(vfd->class_dev.class_id, vfd->devfs_name, BUS_ID_SIZE);
         class_device_register(&vfd->class_dev);
         class_device_create_file(&vfd->class_dev,
                                 &class_device_attr_name);