patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / drivers / ide / ide-probe.c

diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 4257350..4ffaf90 100644 (file)
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -241,17 +241,6 @@ static inline void do_identify (ide_drive_t *drive, u8 cmd)
        drive->media = ide_disk;
        printk("%s DISK drive\n", (drive->is_flash) ? "CFA" : "ATA" );
        QUIRK_LIST(drive);
-
-       /* Initialize queue depth settings */
-       drive->queue_depth = 1;
-#ifdef CONFIG_BLK_DEV_IDE_TCQ_DEPTH
-       drive->queue_depth = CONFIG_BLK_DEV_IDE_TCQ_DEPTH;
-#else
-       drive->queue_depth = drive->id->queue_depth + 1;
-#endif
-       if (drive->queue_depth < 1 || drive->queue_depth > IDE_MAX_TAG)
-               drive->queue_depth = IDE_MAX_TAG;
-
        return;
 
 err_misc:
@@ -283,9 +272,10 @@ static int actual_try_to_identify (ide_drive_t *drive, u8 cmd)
        unsigned long timeout;
        u8 s = 0, a = 0;
 
+       /* take a deep breath */
+       msleep(50);
+
        if (IDE_CONTROL_REG) {
-               /* take a deep breath */
-               ide_delay_50ms();
                a = hwif->INB(IDE_ALTSTATUS_REG);
                s = hwif->INB(IDE_STATUS_REG);
                if ((a ^ s) & ~INDEX_STAT) {
@@ -297,10 +287,8 @@ static int actual_try_to_identify (ide_drive_t *drive, u8 cmd)
                        /* use non-intrusive polling */
                        hd_status = IDE_ALTSTATUS_REG;
                }
-       } else {
-               ide_delay_50ms();
+       } else
                hd_status = IDE_STATUS_REG;
-       }
 
        /* set features register for atapi
         * identify command to be sure of reply
@@ -324,11 +312,11 @@ static int actual_try_to_identify (ide_drive_t *drive, u8 cmd)
                        return 1;
                }
                /* give drive a breather */
-               ide_delay_50ms();
+               msleep(50);
        } while ((hwif->INB(hd_status)) & BUSY_STAT);
 
        /* wait for IRQ and DRQ_STAT */
-       ide_delay_50ms();
+       msleep(50);
        if (OK_STAT((hwif->INB(IDE_STATUS_REG)), DRQ_STAT, BAD_R_STAT)) {
                unsigned long flags;
 
@@ -457,15 +445,15 @@ static int do_probe (ide_drive_t *drive, u8 cmd)
        /* needed for some systems
         * (e.g. crw9624 as drive0 with disk as slave)
         */
-       ide_delay_50ms();
+       msleep(50);
        SELECT_DRIVE(drive);
-       ide_delay_50ms();
+       msleep(50);
        if (hwif->INB(IDE_SELECT_REG) != drive->select.all && !drive->present) {
                if (drive->select.b.unit != 0) {
                        /* exit with drive0 selected */
                        SELECT_DRIVE(&hwif->drives[0]);
                        /* allow BUSY_STAT to assert & clear */
-                       ide_delay_50ms();
+                       msleep(50);
                }
                /* no i/f present: mmm.. this should be a 4 -ml */
                return 3;
@@ -488,14 +476,14 @@ static int do_probe (ide_drive_t *drive, u8 cmd)
                        printk("%s: no response (status = 0x%02x), "
                                "resetting drive\n", drive->name,
                                hwif->INB(IDE_STATUS_REG));
-                       ide_delay_50ms();
+                       msleep(50);
                        hwif->OUTB(drive->select.all, IDE_SELECT_REG);
-                       ide_delay_50ms();
+                       msleep(50);
                        hwif->OUTB(WIN_SRST, IDE_COMMAND_REG);
                        timeout = jiffies;
                        while (((hwif->INB(IDE_STATUS_REG)) & BUSY_STAT) &&
                               time_before(jiffies, timeout + WAIT_WORSTCASE))
-                               ide_delay_50ms();
+                               msleep(50);
                        rc = try_to_identify(drive, cmd);
                }
                if (rc == 1)
@@ -510,7 +498,7 @@ static int do_probe (ide_drive_t *drive, u8 cmd)
        if (drive->select.b.unit != 0) {
                /* exit with drive0 selected */
                SELECT_DRIVE(&hwif->drives[0]);
-               ide_delay_50ms();
+               msleep(50);
                /* ensure drive irq is clear */
                (void) hwif->INB(IDE_STATUS_REG);
        }
@@ -527,7 +515,7 @@ static void enable_nest (ide_drive_t *drive)
 
        printk("%s: enabling %s -- ", hwif->name, drive->id->model);
        SELECT_DRIVE(drive);
-       ide_delay_50ms();
+       msleep(50);
        hwif->OUTB(EXABYTE_ENABLE_NEST, IDE_COMMAND_REG);
        timeout = jiffies + WAIT_WORSTCASE;
        do {
@@ -535,10 +523,10 @@ static void enable_nest (ide_drive_t *drive)
                        printk("failed (timeout)\n");
                        return;
                }
-               ide_delay_50ms();
+               msleep(50);
        } while ((hwif->INB(IDE_STATUS_REG)) & BUSY_STAT);
 
-       ide_delay_50ms();
+       msleep(50);
 
        if (!OK_STAT((hwif->INB(IDE_STATUS_REG)), 0, BAD_STAT)) {
                printk("failed (status = 0x%02x)\n", hwif->INB(IDE_STATUS_REG));
@@ -647,8 +635,6 @@ static void hwif_register (ide_hwif_t *hwif)
        device_register(&hwif->gendev);
 }
 
-//EXPORT_SYMBOL(hwif_register);
-
 #ifdef CONFIG_PPC
 static int wait_hwif_ready(ide_hwif_t *hwif)
 {
@@ -691,7 +677,7 @@ static int wait_hwif_ready(ide_hwif_t *hwif)
  * This routine only knows how to look for drive units 0 and 1
  * on an interface, so any setting of MAX_DRIVES > 2 won't work here.
  */
-void probe_hwif (ide_hwif_t *hwif)
+static void probe_hwif(ide_hwif_t *hwif)
 {
        unsigned int unit;
        unsigned long flags;
@@ -781,7 +767,7 @@ void probe_hwif (ide_hwif_t *hwif)
                udelay(10);
                hwif->OUTB(8, hwif->io_ports[IDE_CONTROL_OFFSET]);
                do {
-                       ide_delay_50ms();
+                       msleep(50);
                        stat = hwif->INB(hwif->io_ports[IDE_STATUS_OFFSET]);
                } while ((stat & BUSY_STAT) && time_after(timeout, jiffies));
 
@@ -801,18 +787,12 @@ void probe_hwif (ide_hwif_t *hwif)
 
        for (unit = 0; unit < MAX_DRIVES; ++unit) {
                ide_drive_t *drive = &hwif->drives[unit];
-               int enable_dma = 1;
 
                if (drive->present) {
                        if (hwif->tuneproc != NULL && 
                                drive->autotune == IDE_TUNE_AUTO)
                                /* auto-tune PIO mode */
                                hwif->tuneproc(drive, 255);
-
-#ifdef CONFIG_IDEDMA_ONLYDISK
-                       if (drive->media != ide_disk)
-                               enable_dma = 0;
-#endif
                        /*
                         * MAJOR HACK BARF :-/
                         *
@@ -832,16 +812,16 @@ void probe_hwif (ide_hwif_t *hwif)
                                 *   PARANOIA!!!
                                 */
                                hwif->ide_dma_off_quietly(drive);
-                               if (enable_dma)
+#ifdef CONFIG_IDEDMA_ONLYDISK
+                               if (drive->media == ide_disk)
+#endif
                                        hwif->ide_dma_check(drive);
                        }
                }
        }
 }
 
-EXPORT_SYMBOL(probe_hwif);
-
-int hwif_init (ide_hwif_t *hwif);
+static int hwif_init(ide_hwif_t *hwif);
 int probe_hwif_init (ide_hwif_t *hwif)
 {
        probe_hwif(hwif);
@@ -876,7 +856,7 @@ EXPORT_SYMBOL(probe_hwif_init);
  *
  * This routine detects and reports such situations, but does not fix them.
  */
-void save_match (ide_hwif_t *hwif, ide_hwif_t *new, ide_hwif_t **match)
+static void save_match(ide_hwif_t *hwif, ide_hwif_t *new, ide_hwif_t **match)
 {
        ide_hwif_t *m = *match;
 
@@ -889,7 +869,6 @@ void save_match (ide_hwif_t *hwif, ide_hwif_t *new, ide_hwif_t **match)
        if (!m || m->irq != hwif->irq) /* don't undo a prior perfect match */
                *match = new;
 }
-EXPORT_SYMBOL(save_match);
 #endif /* MAX_HWIFS > 1 */
 
 /*
@@ -1236,9 +1215,7 @@ static void init_gendisk (ide_hwif_t *hwif)
                        THIS_MODULE, ata_probe, ata_lock, hwif);
 }
 
-EXPORT_SYMBOL(init_gendisk);
-
-int hwif_init (ide_hwif_t *hwif)
+static int hwif_init(ide_hwif_t *hwif)
 {
        int old_irq, unit;
 
@@ -1306,8 +1283,6 @@ out:
        return 0;
 }
 
-EXPORT_SYMBOL(hwif_init);
-
 int ideprobe_init (void)
 {
        unsigned int index;