cs5530: always tune PIO
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Tue, 16 Oct 2007 20:29:53 +0000 (22:29 +0200)
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Tue, 16 Oct 2007 20:29:53 +0000 (22:29 +0200)
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
drivers/ide/pci/cs5530.c

index e4121577cef0291e71abb435cd88b7ab21b51ecb..c972eb9bd4570221682ead55219db2da5474f593 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/ide/pci/cs5530.c              Version 0.74    Jul 28 2007
+ * linux/drivers/ide/pci/cs5530.c              Version 0.75    Aug 2 2007
  *
  * Copyright (C) 2000                  Andre Hedrick <andre@linux-ide.org>
  * Copyright (C) 2000                  Mark Lord <mlord@pobox.com>
@@ -270,20 +270,13 @@ static void __devinit init_hwif_cs5530 (ide_hwif_t *hwif)
 
        basereg = CS5530_BASEREG(hwif);
        d0_timings = inl(basereg + 0);
-       if (CS5530_BAD_PIO(d0_timings)) {
-               /* PIO timings not initialized? */
+       if (CS5530_BAD_PIO(d0_timings))
                outl(cs5530_pio_timings[(d0_timings >> 31) & 1][0], basereg + 0);
-               if (!hwif->drives[0].autotune)
-                       hwif->drives[0].autotune = 1;
-                       /* needs autotuning later */
-       }
-       if (CS5530_BAD_PIO(inl(basereg + 8))) {
-               /* PIO timings not initialized? */
+       if (CS5530_BAD_PIO(inl(basereg + 8)))
                outl(cs5530_pio_timings[(d0_timings >> 31) & 1][0], basereg + 8);
-               if (!hwif->drives[1].autotune)
-                       hwif->drives[1].autotune = 1;
-                       /* needs autotuning later */
-       }
+
+       hwif->drives[0].autotune = 1;
+       hwif->drives[1].autotune = 1;
 
        if (hwif->dma_base == 0)
                return;