diff options
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/dvb/dvb-core/dvbdev.c | 6 | ||||
-rw-r--r-- | drivers/media/video/videodev.c | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c index 8e926d98bd92..40774feb8953 100644 --- a/drivers/media/dvb/dvb-core/dvbdev.c +++ b/drivers/media/dvb/dvb-core/dvbdev.c | |||
@@ -248,9 +248,6 @@ void dvb_unregister_device(struct dvb_device *dvbdev) | |||
248 | if (!dvbdev) | 248 | if (!dvbdev) |
249 | return; | 249 | return; |
250 | 250 | ||
251 | devfs_remove("dvb/adapter%d/%s%d", dvbdev->adapter->num, | ||
252 | dnames[dvbdev->type], dvbdev->id); | ||
253 | |||
254 | class_device_destroy(dvb_class, MKDEV(DVB_MAJOR, nums2minor(dvbdev->adapter->num, | 251 | class_device_destroy(dvb_class, MKDEV(DVB_MAJOR, nums2minor(dvbdev->adapter->num, |
255 | dvbdev->type, dvbdev->id))); | 252 | dvbdev->type, dvbdev->id))); |
256 | 253 | ||
@@ -314,8 +311,6 @@ EXPORT_SYMBOL(dvb_register_adapter); | |||
314 | 311 | ||
315 | int dvb_unregister_adapter(struct dvb_adapter *adap) | 312 | int dvb_unregister_adapter(struct dvb_adapter *adap) |
316 | { | 313 | { |
317 | devfs_remove("dvb/adapter%d", adap->num); | ||
318 | |||
319 | if (mutex_lock_interruptible(&dvbdev_register_lock)) | 314 | if (mutex_lock_interruptible(&dvbdev_register_lock)) |
320 | return -ERESTARTSYS; | 315 | return -ERESTARTSYS; |
321 | list_del (&adap->list_head); | 316 | list_del (&adap->list_head); |
@@ -421,7 +416,6 @@ error: | |||
421 | 416 | ||
422 | static void __exit exit_dvbdev(void) | 417 | static void __exit exit_dvbdev(void) |
423 | { | 418 | { |
424 | devfs_remove("dvb"); | ||
425 | class_destroy(dvb_class); | 419 | class_destroy(dvb_class); |
426 | cdev_del(&dvb_device_cdev); | 420 | cdev_del(&dvb_device_cdev); |
427 | unregister_chrdev_region(MKDEV(DVB_MAJOR, 0), MAX_DVB_MINORS); | 421 | unregister_chrdev_region(MKDEV(DVB_MAJOR, 0), MAX_DVB_MINORS); |
diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c index cc67ee952838..3178353787da 100644 --- a/drivers/media/video/videodev.c +++ b/drivers/media/video/videodev.c | |||
@@ -1601,7 +1601,6 @@ void video_unregister_device(struct video_device *vfd) | |||
1601 | if(video_device[vfd->minor]!=vfd) | 1601 | if(video_device[vfd->minor]!=vfd) |
1602 | panic("videodev: bad unregister"); | 1602 | panic("videodev: bad unregister"); |
1603 | 1603 | ||
1604 | devfs_remove(vfd->devfs_name); | ||
1605 | video_device[vfd->minor]=NULL; | 1604 | video_device[vfd->minor]=NULL; |
1606 | class_device_unregister(&vfd->class_dev); | 1605 | class_device_unregister(&vfd->class_dev); |
1607 | mutex_unlock(&videodev_lock); | 1606 | mutex_unlock(&videodev_lock); |