1 files changed, 58 insertions, 58 deletions

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 97894abd9ebc..ab9ca2b5b66c 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -1,7 +1,6 @@
 /*
- *  linux/drivers/ide/ide.c             Version 7.00beta2       Mar 05 2003
- *
- *  Copyright (C) 1994-1998  Linus Torvalds & authors (see below)
+ *  Copyright (C) 1994-1998         Linus Torvalds & authors (see below)
+ *  Copyrifht (C) 2003-2005, 2007   Bartlomiej Zolnierkiewicz
  */
 
 /*
@@ -46,7 +45,6 @@
  */
 
 #define REVISION        "Revision: 7.00alpha2"
-#define VERSION         "Id: ide.c 7.00a2 20020906"
 
 #define _IDE_C                  /* Tell ide.h it's really us */
 
@@ -242,22 +240,12 @@ static int ide_system_bus_speed(void)
 #define pci_default 0
 #endif /* CONFIG_PCI */
 
-        if (!system_bus_speed) {
-                if (idebus_parameter) {
-                        /* user supplied value */
-                        system_bus_speed = idebus_parameter;
-                } else if (pci_dev_present(pci_default)) {
-                        /* safe default value for PCI */
-                        system_bus_speed = 33;
-                } else {
-                        /* safe default value for VESA and PCI */
-                        system_bus_speed = 50;
-                }
-                printk(KERN_INFO "ide: Assuming %dMHz system bus speed "
-                        "for PIO modes%s\n", system_bus_speed,
-                        idebus_parameter ? "" : "; override with idebus=xx");
-        }
-        return system_bus_speed;
+        /* user supplied value */
+        if (idebus_parameter)
+                return idebus_parameter;
+
+        /* safe default value for PCI or VESA and PCI*/
+        return pci_dev_present(pci_default) ? 33 : 50;
 }
 
 ide_hwif_t * ide_find_port(unsigned long base)
@@ -405,8 +393,9 @@ static void ide_hwif_restore(ide_hwif_t *hwif, ide_hwif_t *tmp_hwif)
         hwif->chipset                   = tmp_hwif->chipset;
         hwif->hold                      = tmp_hwif->hold;
 
+        hwif->dev                       = tmp_hwif->dev;
+
 #ifdef CONFIG_BLK_DEV_IDEPCI
-        hwif->pci_dev                   = tmp_hwif->pci_dev;
         hwif->cds                       = tmp_hwif->cds;
 #endif
 
@@ -472,6 +461,41 @@ static void ide_hwif_restore(ide_hwif_t *hwif, ide_hwif_t *tmp_hwif)
         hwif->hwif_data                 = tmp_hwif->hwif_data;
 }
 
+void ide_remove_port_from_hwgroup(ide_hwif_t *hwif)
+{
+        ide_hwgroup_t *hwgroup = hwif->hwgroup;
+
+        spin_lock_irq(&ide_lock);
+        /*
+         * Remove us from the hwgroup, and free
+         * the hwgroup if we were the only member
+         */
+        if (hwif->next == hwif) {
+                BUG_ON(hwgroup->hwif != hwif);
+                kfree(hwgroup);
+        } else {
+                /* There is another interface in hwgroup.
+                 * Unlink us, and set hwgroup->drive and ->hwif to
+                 * something sane.
+                 */
+                ide_hwif_t *g = hwgroup->hwif;
+
+                while (g->next != hwif)
+                        g = g->next;
+                g->next = hwif->next;
+                if (hwgroup->hwif == hwif) {
+                        /* Chose a random hwif for hwgroup->hwif.
+                         * It's guaranteed that there are no drives
+                         * left in the hwgroup.
+                         */
+                        BUG_ON(hwgroup->drive != NULL);
+                        hwgroup->hwif = g;
+                }
+                BUG_ON(hwgroup->hwif == hwif);
+        }
+        spin_unlock_irq(&ide_lock);
+}
+
 /**
  *      ide_unregister          -       free an IDE interface
  *      @index: index of interface (will change soon to a pointer)
@@ -539,43 +563,8 @@ void ide_unregister(unsigned int index)
         if (irq_count == 1)
                 free_irq(hwif->irq, hwgroup);
 
-        spin_lock_irq(&ide_lock);
-        /*
-         * Note that we only release the standard ports,
-         * and do not even try to handle any extra ports
-         * allocated for weird IDE interface chipsets.
-         */
-        ide_hwif_release_regions(hwif);
-
-        /*
-         * Remove us from the hwgroup, and free
-         * the hwgroup if we were the only member
-         */
-        if (hwif->next == hwif) {
-                BUG_ON(hwgroup->hwif != hwif);
-                kfree(hwgroup);
-        } else {
-                /* There is another interface in hwgroup.
-                 * Unlink us, and set hwgroup->drive and ->hwif to
-                 * something sane.
-                 */
-                g = hwgroup->hwif;
-                while (g->next != hwif)
-                        g = g->next;
-                g->next = hwif->next;
-                if (hwgroup->hwif == hwif) {
-                        /* Chose a random hwif for hwgroup->hwif.
-                         * It's guaranteed that there are no drives
-                         * left in the hwgroup.
-                         */
-                        BUG_ON(hwgroup->drive != NULL);
-                        hwgroup->hwif = g;
-                }
-                BUG_ON(hwgroup->hwif == hwif);
-        }
+        ide_remove_port_from_hwgroup(hwif);
 
-        /* More messed up locking ... */
-        spin_unlock_irq(&ide_lock);
         device_unregister(&hwif->gendev);
         wait_for_completion(&hwif->gendev_rel_comp);
 
@@ -601,6 +590,13 @@ void ide_unregister(unsigned int index)
                 hwif->extra_ports = 0;
         }
 
+        /*
+         * Note that we only release the standard ports,
+         * and do not even try to handle any extra ports
+         * allocated for weird IDE interface chipsets.
+         */
+        ide_hwif_release_regions(hwif);
+
         /* copy original settings */
         tmp_hwif = *hwif;
 
@@ -913,7 +909,7 @@ static int set_unmaskirq(ide_drive_t *drive, int arg)
 
 int system_bus_clock (void)
 {
-        return((int) ((!system_bus_speed) ? ide_system_bus_speed() : system_bus_speed ));
+        return system_bus_speed;
 }
 
 EXPORT_SYMBOL(system_bus_clock);
@@ -1668,6 +1664,10 @@ static int __init ide_init(void)
         printk(KERN_INFO "Uniform Multi-Platform E-IDE driver " REVISION "\n");
         system_bus_speed = ide_system_bus_speed();
 
+        printk(KERN_INFO "ide: Assuming %dMHz system bus speed "
+                         "for PIO modes%s\n", system_bus_speed,
+                        idebus_parameter ? "" : "; override with idebus=xx");
+
         ret = bus_register(&ide_bus_type);
         if (ret < 0) {
                 printk(KERN_WARNING "IDE: bus_register error: %d\n", ret);