diff options
Diffstat (limited to 'drivers/media/dvb/dvb-core/dvbdev.c')
-rw-r--r-- | drivers/media/dvb/dvb-core/dvbdev.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c index 134c2bbbeeb5..40774feb8953 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, | |||
231 | 231 | ||
232 | mutex_unlock(&dvbdev_register_lock); | 232 | mutex_unlock(&dvbdev_register_lock); |
233 | 233 | ||
234 | devfs_mk_cdev(MKDEV(DVB_MAJOR, nums2minor(adap->num, type, id)), | ||
235 | S_IFCHR | S_IRUSR | S_IWUSR, | ||
236 | "dvb/adapter%d/%s%d", adap->num, dnames[type], id); | ||
237 | |||
238 | class_device_create(dvb_class, NULL, MKDEV(DVB_MAJOR, nums2minor(adap->num, type, id)), | 234 | class_device_create(dvb_class, NULL, MKDEV(DVB_MAJOR, nums2minor(adap->num, type, id)), |
239 | adap->device, "dvb%d.%s%d", adap->num, dnames[type], id); | 235 | adap->device, "dvb%d.%s%d", adap->num, dnames[type], id); |
240 | 236 | ||
@@ -252,9 +248,6 @@ void dvb_unregister_device(struct dvb_device *dvbdev) | |||
252 | if (!dvbdev) | 248 | if (!dvbdev) |
253 | return; | 249 | return; |
254 | 250 | ||
255 | devfs_remove("dvb/adapter%d/%s%d", dvbdev->adapter->num, | ||
256 | dnames[dvbdev->type], dvbdev->id); | ||
257 | |||
258 | 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, |
259 | dvbdev->type, dvbdev->id))); | 252 | dvbdev->type, dvbdev->id))); |
260 | 253 | ||
@@ -302,7 +295,6 @@ int dvb_register_adapter(struct dvb_adapter *adap, const char *name, struct modu | |||
302 | 295 | ||
303 | printk ("DVB: registering new adapter (%s).\n", name); | 296 | printk ("DVB: registering new adapter (%s).\n", name); |
304 | 297 | ||
305 | devfs_mk_dir("dvb/adapter%d", num); | ||
306 | adap->num = num; | 298 | adap->num = num; |
307 | adap->name = name; | 299 | adap->name = name; |
308 | adap->module = module; | 300 | adap->module = module; |
@@ -319,8 +311,6 @@ EXPORT_SYMBOL(dvb_register_adapter); | |||
319 | 311 | ||
320 | int dvb_unregister_adapter(struct dvb_adapter *adap) | 312 | int dvb_unregister_adapter(struct dvb_adapter *adap) |
321 | { | 313 | { |
322 | devfs_remove("dvb/adapter%d", adap->num); | ||
323 | |||
324 | if (mutex_lock_interruptible(&dvbdev_register_lock)) | 314 | if (mutex_lock_interruptible(&dvbdev_register_lock)) |
325 | return -ERESTARTSYS; | 315 | return -ERESTARTSYS; |
326 | list_del (&adap->list_head); | 316 | list_del (&adap->list_head); |
@@ -410,8 +400,6 @@ static int __init init_dvbdev(void) | |||
410 | goto error; | 400 | goto error; |
411 | } | 401 | } |
412 | 402 | ||
413 | devfs_mk_dir("dvb"); | ||
414 | |||
415 | dvb_class = class_create(THIS_MODULE, "dvb"); | 403 | dvb_class = class_create(THIS_MODULE, "dvb"); |
416 | if (IS_ERR(dvb_class)) { | 404 | if (IS_ERR(dvb_class)) { |
417 | retval = PTR_ERR(dvb_class); | 405 | retval = PTR_ERR(dvb_class); |
@@ -428,7 +416,6 @@ error: | |||
428 | 416 | ||
429 | static void __exit exit_dvbdev(void) | 417 | static void __exit exit_dvbdev(void) |
430 | { | 418 | { |
431 | devfs_remove("dvb"); | ||
432 | class_destroy(dvb_class); | 419 | class_destroy(dvb_class); |
433 | cdev_del(&dvb_device_cdev); | 420 | cdev_del(&dvb_device_cdev); |
434 | unregister_chrdev_region(MKDEV(DVB_MAJOR, 0), MAX_DVB_MINORS); | 421 | unregister_chrdev_region(MKDEV(DVB_MAJOR, 0), MAX_DVB_MINORS); |