aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2005-06-21 00:15:16 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2006-06-26 15:25:06 -0400
commit94f6c59dcf16f10a20fbe3d1f098b159433f94bd (patch)
tree06ec8cdb07de07389aa80fb394724ac07615a887 /drivers/ide/ide.c
parentaa4148cfc7b3b93eeaf755a7d14f10afaffe9a96 (diff)
[PATCH] devfs: Remove devfs support from the ide subsystem.
Also removes the ide drive devfs_name field as it's no longer needed Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/ide/ide.c')
-rw-r--r--drivers/ide/ide.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 59fe358048b3..1cdf44205162 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -147,7 +147,6 @@
147#include <linux/pci.h> 147#include <linux/pci.h>
148#include <linux/delay.h> 148#include <linux/delay.h>
149#include <linux/ide.h> 149#include <linux/ide.h>
150#include <linux/devfs_fs_kernel.h>
151#include <linux/completion.h> 150#include <linux/completion.h>
152#include <linux/reboot.h> 151#include <linux/reboot.h>
153#include <linux/cdrom.h> 152#include <linux/cdrom.h>
@@ -592,13 +591,8 @@ void ide_unregister(unsigned int index)
592 goto abort; 591 goto abort;
593 for (unit = 0; unit < MAX_DRIVES; ++unit) { 592 for (unit = 0; unit < MAX_DRIVES; ++unit) {
594 drive = &hwif->drives[unit]; 593 drive = &hwif->drives[unit];
595 if (!drive->present) { 594 if (!drive->present)
596 if (drive->devfs_name[0] != '\0') {
597 devfs_remove(drive->devfs_name);
598 drive->devfs_name[0] = '\0';
599 }
600 continue; 595 continue;
601 }
602 spin_unlock_irq(&ide_lock); 596 spin_unlock_irq(&ide_lock);
603 device_unregister(&drive->gendev); 597 device_unregister(&drive->gendev);
604 wait_for_completion(&drive->gendev_rel_comp); 598 wait_for_completion(&drive->gendev_rel_comp);
@@ -1996,7 +1990,6 @@ EXPORT_SYMBOL_GPL(ide_bus_type);
1996static int __init ide_init(void) 1990static int __init ide_init(void)
1997{ 1991{
1998 printk(KERN_INFO "Uniform Multi-Platform E-IDE driver " REVISION "\n"); 1992 printk(KERN_INFO "Uniform Multi-Platform E-IDE driver " REVISION "\n");
1999 devfs_mk_dir("ide");
2000 system_bus_speed = ide_system_bus_speed(); 1993 system_bus_speed = ide_system_bus_speed();
2001 1994
2002 bus_register(&ide_bus_type); 1995 bus_register(&ide_bus_type);
@@ -2074,7 +2067,6 @@ void cleanup_module (void)
2074#ifdef CONFIG_PROC_FS 2067#ifdef CONFIG_PROC_FS
2075 proc_ide_destroy(); 2068 proc_ide_destroy();
2076#endif 2069#endif
2077 devfs_remove("ide");
2078 2070
2079 bus_unregister(&ide_bus_type); 2071 bus_unregister(&ide_bus_type);
2080} 2072}