Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6: (49 commits)
  drivers/ide: Fix continuation line formats
  ide: fixed section mismatch warning in cmd640.c
  ide: ide_timing_compute() fixup
  ide: make ide_get_best_pio_mode() static
  via82cxxx: use ->pio_mode value to determine pair device speed
  tx493xide: use ->pio_mode value to determine pair device speed
  siimage: use ->pio_mode value to determine pair device speed
  palm_bk3710: use ->pio_mode value to determine pair device speed
  it821x: use ->pio_mode value to determine pair device speed
  cs5536: use ->pio_mode value to determine pair device speed
  cs5535: use ->pio_mode value to determine pair device speed
  cmd64x: fix handling of address setup timings
  amd74xx: use ->pio_mode value to determine pair device speed
  alim15x3: fix handling of UDMA enable bit
  alim15x3: fix handling of DMA timings
  alim15x3: fix handling of command timings
  alim15x3: fix handling of address setup timings
  ide-timings: use ->pio_mode value to determine fastest PIO speed
  ide: change ->set_dma_mode method parameters
  ide: change ->set_pio_mode method parameters
  ...

1 files changed, 9 insertions, 9 deletions

diff --git a/drivers/ide/ide-timings.c b/drivers/ide/ide-timings.c
index 001a56365be5..0e05f75934c9 100644
--- a/drivers/ide/ide-timings.c
+++ b/drivers/ide/ide-timings.c
@@ -166,12 +166,13 @@ int ide_timing_compute(ide_drive_t *drive, u8 speed,
         if (id[ATA_ID_FIELD_VALID] & 2) {       /* EIDE drive */
                 memset(&p, 0, sizeof(p));
 
-                if (speed <= XFER_PIO_2)
-                        p.cycle = p.cyc8b = id[ATA_ID_EIDE_PIO];
-                else if ((speed <= XFER_PIO_4) ||
-                         (speed == XFER_PIO_5 && !ata_id_is_cfa(id)))
-                        p.cycle = p.cyc8b = id[ATA_ID_EIDE_PIO_IORDY];
-                else if (speed >= XFER_MW_DMA_0 && speed <= XFER_MW_DMA_2)
+                if (speed >= XFER_PIO_0 && speed < XFER_SW_DMA_0) {
+                        if (speed <= XFER_PIO_2)
+                                p.cycle = p.cyc8b = id[ATA_ID_EIDE_PIO];
+                        else if ((speed <= XFER_PIO_4) ||
+                                 (speed == XFER_PIO_5 && !ata_id_is_cfa(id)))
+                                p.cycle = p.cyc8b = id[ATA_ID_EIDE_PIO_IORDY];
+                } else if (speed >= XFER_MW_DMA_0 && speed <= XFER_MW_DMA_2)
                         p.cycle = id[ATA_ID_EIDE_DMA_MIN];
 
                 ide_timing_merge(&p, t, t, IDE_TIMING_CYCLE | IDE_TIMING_CYC8B);
@@ -185,11 +186,10 @@ int ide_timing_compute(ide_drive_t *drive, u8 speed,
         /*
          * Even in DMA/UDMA modes we still use PIO access for IDENTIFY,
          * S.M.A.R.T and some other commands. We have to ensure that the
-         * DMA cycle timing is slower/equal than the fastest PIO timing.
+         * DMA cycle timing is slower/equal than the current PIO timing.
          */
         if (speed >= XFER_SW_DMA_0) {
-                u8 pio = ide_get_best_pio_mode(drive, 255, 5);
-                ide_timing_compute(drive, XFER_PIO_0 + pio, &p, T, UT);
+                ide_timing_compute(drive, drive->pio_mode, &p, T, UT);
                 ide_timing_merge(&p, t, t, IDE_TIMING_ALL);
         }