diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2005-06-21 00:15:16 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-26 15:25:07 -0400 |
commit | 8ab5e4c15b53e147c08031a959d9f776823dbe73 (patch) | |
tree | b851d4c1fdbd396379279e4475f7f778a667a208 /fs | |
parent | 7c69ef79741910883d5543caafa06aca3ebadbd1 (diff) |
[PATCH] devfs: Remove devfs_remove() function from the kernel tree
Removes the devfs_remove() function and all callers of it.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/coda/psdev.c | 10 | ||||
-rw-r--r-- | fs/partitions/check.c | 1 |
2 files changed, 2 insertions, 9 deletions
diff --git a/fs/coda/psdev.c b/fs/coda/psdev.c index f478222cb5c9..aaf6462a9421 100644 --- a/fs/coda/psdev.c +++ b/fs/coda/psdev.c | |||
@@ -409,12 +409,9 @@ static int __init init_coda(void) | |||
409 | } | 409 | } |
410 | return 0; | 410 | return 0; |
411 | out: | 411 | out: |
412 | for (i = 0; i < MAX_CODADEVS; i++) { | 412 | for (i = 0; i < MAX_CODADEVS; i++) |
413 | class_device_destroy(coda_psdev_class, MKDEV(CODA_PSDEV_MAJOR, i)); | 413 | class_device_destroy(coda_psdev_class, MKDEV(CODA_PSDEV_MAJOR, i)); |
414 | devfs_remove("coda/%d", i); | ||
415 | } | ||
416 | class_destroy(coda_psdev_class); | 414 | class_destroy(coda_psdev_class); |
417 | devfs_remove("coda"); | ||
418 | unregister_chrdev(CODA_PSDEV_MAJOR, "coda"); | 415 | unregister_chrdev(CODA_PSDEV_MAJOR, "coda"); |
419 | coda_sysctl_clean(); | 416 | coda_sysctl_clean(); |
420 | out1: | 417 | out1: |
@@ -431,12 +428,9 @@ static void __exit exit_coda(void) | |||
431 | if ( err != 0 ) { | 428 | if ( err != 0 ) { |
432 | printk("coda: failed to unregister filesystem\n"); | 429 | printk("coda: failed to unregister filesystem\n"); |
433 | } | 430 | } |
434 | for (i = 0; i < MAX_CODADEVS; i++) { | 431 | for (i = 0; i < MAX_CODADEVS; i++) |
435 | class_device_destroy(coda_psdev_class, MKDEV(CODA_PSDEV_MAJOR, i)); | 432 | class_device_destroy(coda_psdev_class, MKDEV(CODA_PSDEV_MAJOR, i)); |
436 | devfs_remove("coda/%d", i); | ||
437 | } | ||
438 | class_destroy(coda_psdev_class); | 433 | class_destroy(coda_psdev_class); |
439 | devfs_remove("coda"); | ||
440 | unregister_chrdev(CODA_PSDEV_MAJOR, "coda"); | 434 | unregister_chrdev(CODA_PSDEV_MAJOR, "coda"); |
441 | coda_sysctl_clean(); | 435 | coda_sysctl_clean(); |
442 | coda_destroy_inodecache(); | 436 | coda_destroy_inodecache(); |
diff --git a/fs/partitions/check.c b/fs/partitions/check.c index d7a5078b3d75..202f50acea88 100644 --- a/fs/partitions/check.c +++ b/fs/partitions/check.c | |||
@@ -320,7 +320,6 @@ void delete_partition(struct gendisk *disk, int part) | |||
320 | p->nr_sects = 0; | 320 | p->nr_sects = 0; |
321 | p->ios[0] = p->ios[1] = 0; | 321 | p->ios[0] = p->ios[1] = 0; |
322 | p->sectors[0] = p->sectors[1] = 0; | 322 | p->sectors[0] = p->sectors[1] = 0; |
323 | devfs_remove("%s/part%d", disk->devfs_name, part); | ||
324 | sysfs_remove_link(&p->kobj, "subsystem"); | 323 | sysfs_remove_link(&p->kobj, "subsystem"); |
325 | if (p->holder_dir) | 324 | if (p->holder_dir) |
326 | kobject_unregister(p->holder_dir); | 325 | kobject_unregister(p->holder_dir); |