1 files changed, 2 insertions, 17 deletions

diff --git a/drivers/ide/ide-proc.c b/drivers/ide/ide-proc.c
index bab88ca7f7ec..edd7f186dc4d 100644
--- a/drivers/ide/ide-proc.c
+++ b/drivers/ide/ide-proc.c
@@ -46,9 +46,6 @@ static int proc_ide_read_imodel
         int             len;
         const char      *name;
 
-        /*
-         * Neither ide_unknown nor ide_forced should be set at this point.
-         */
         switch (hwif->chipset) {
                 case ide_generic:       name = "generic";       break;
                 case ide_pci:           name = "pci";           break;
@@ -764,27 +761,16 @@ void ide_proc_port_register_devices(ide_hwif_t *hwif)
         }
 }
 
-static void destroy_proc_ide_device(ide_hwif_t *hwif, ide_drive_t *drive)
+void ide_proc_unregister_device(ide_drive_t *drive)
 {
         if (drive->proc) {
                 ide_remove_proc_entries(drive->proc, generic_drive_entries);
                 remove_proc_entry(drive->name, proc_ide_root);
-                remove_proc_entry(drive->name, hwif->proc);
+                remove_proc_entry(drive->name, drive->hwif->proc);
                 drive->proc = NULL;
         }
 }
 
-static void destroy_proc_ide_drives(ide_hwif_t *hwif)
-{
-        int     d;
-
-        for (d = 0; d < MAX_DRIVES; d++) {
-                ide_drive_t *drive = &hwif->drives[d];
-                if (drive->proc)
-                        destroy_proc_ide_device(hwif, drive);
-        }
-}
-
 static ide_proc_entry_t hwif_entries[] = {
         { "channel",    S_IFREG|S_IRUGO,        proc_ide_read_channel,  NULL },
         { "mate",       S_IFREG|S_IRUGO,        proc_ide_read_mate,     NULL },
@@ -816,7 +802,6 @@ EXPORT_SYMBOL_GPL(ide_pci_create_host_proc);
 void ide_proc_unregister_port(ide_hwif_t *hwif)
 {
         if (hwif->proc) {
-                destroy_proc_ide_drives(hwif);
                 ide_remove_proc_entries(hwif->proc, hwif_entries);
                 remove_proc_entry(hwif->name, proc_ide_root);
                 hwif->proc = NULL;