ide: remove ide_use_fast_pio()

Remove ide_use_fast_pio() and just re-tune PIO unconditionally if DMA tuning
has failed in ->ide_dma_check.  All host drivers using ide_use_fast_pio() set
drive->autotune so PIO is always tuned anyway and in some cases we _really_
need to re-tune PIO because PIO and DMA timings are shared.

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

17 files changed, 15 insertions, 46 deletions

diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c
index 0e2562f0f74e..af86433baede 100644
--- a/drivers/ide/ide-lib.c
+++ b/drivers/ide/ide-lib.c
@@ -96,21 +96,6 @@ static u8 ide_rate_filter(ide_drive_t *drive, u8 speed)
         return min(speed, mode);
 }
 
-int ide_use_fast_pio(ide_drive_t *drive)
-{
-        struct hd_driveid *id = drive->id;
-
-        if ((id->capability & 1) && drive->autodma)
-                return 1;
-
-        if ((id->capability & 8) || (id->field_valid & 2))
-                return 1;
-
-        return 0;
-}
-
-EXPORT_SYMBOL_GPL(ide_use_fast_pio);
-
 /*
  * Standard (generic) timings for PIO modes, from ATA2 specification.
  * These timings are for access to the IDE data port register *only*.
diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c
index 2e82ef546007..91bf5beba5ce 100644
--- a/drivers/ide/pci/aec62xx.c
+++ b/drivers/ide/pci/aec62xx.c
@@ -146,8 +146,7 @@ static int aec62xx_config_drive_xfer_rate (ide_drive_t *drive)
         if (ide_tune_dma(drive))
                 return 0;
 
-        if (ide_use_fast_pio(drive))
-                ide_set_max_pio(drive);
+        ide_set_max_pio(drive);
 
         return -1;
 }
diff --git a/drivers/ide/pci/atiixp.c b/drivers/ide/pci/atiixp.c
index 644f4aea795a..b457df883dcb 100644
--- a/drivers/ide/pci/atiixp.c
+++ b/drivers/ide/pci/atiixp.c
@@ -171,8 +171,7 @@ static int atiixp_dma_check(ide_drive_t *drive)
         if (ide_tune_dma(drive))
                 return 0;
 
-        if (ide_use_fast_pio(drive))
-                ide_set_max_pio(drive);
+        ide_set_max_pio(drive);
 
         return -1;
 }
diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c
index d50f15e34b80..52790cb6bce4 100644
--- a/drivers/ide/pci/cmd64x.c
+++ b/drivers/ide/pci/cmd64x.c
@@ -335,8 +335,7 @@ static int cmd64x_config_drive_for_dma (ide_drive_t *drive)
         if (ide_tune_dma(drive))
                 return 0;
 
-        if (ide_use_fast_pio(drive))
-                ide_set_max_pio(drive);
+        ide_set_max_pio(drive);
 
         return -1;
 }
diff --git a/drivers/ide/pci/cs5535.c b/drivers/ide/pci/cs5535.c
index 896cc9211bd3..2a72b4f22ddf 100644
--- a/drivers/ide/pci/cs5535.c
+++ b/drivers/ide/pci/cs5535.c
@@ -162,8 +162,7 @@ static int cs5535_dma_check(ide_drive_t *drive)
         if (ide_tune_dma(drive))
                 return 0;
 
-        if (ide_use_fast_pio(drive))
-                ide_set_max_pio(drive);
+        ide_set_max_pio(drive);
 
         return -1;
 }
diff --git a/drivers/ide/pci/hpt34x.c b/drivers/ide/pci/hpt34x.c
index bccf0667a732..69724887225c 100644
--- a/drivers/ide/pci/hpt34x.c
+++ b/drivers/ide/pci/hpt34x.c
@@ -85,8 +85,7 @@ static int hpt34x_config_drive_xfer_rate (ide_drive_t *drive)
         if (ide_tune_dma(drive))
                 return -1;
 
-        if (ide_use_fast_pio(drive))
-                ide_set_max_pio(drive);
+        ide_set_max_pio(drive);
 
         return -1;
 }
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c
index a8097b5476a2..992b60eeee3f 100644
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
@@ -718,8 +718,7 @@ static int hpt366_config_drive_xfer_rate(ide_drive_t *drive)
         if (ide_tune_dma(drive))
                 return 0;
 
-        if (ide_use_fast_pio(drive))
-                ide_set_max_pio(drive);
+        ide_set_max_pio(drive);
 
         return -1;
 }
diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c
index c3a751207e64..9767232e2f8a 100644
--- a/drivers/ide/pci/pdc202xx_new.c
+++ b/drivers/ide/pci/pdc202xx_new.c
@@ -228,8 +228,7 @@ static int pdcnew_config_drive_xfer_rate(ide_drive_t *drive)
         if (ide_tune_dma(drive))
                 return 0;
 
-        if (ide_use_fast_pio(drive))
-                ide_set_max_pio(drive);
+        ide_set_max_pio(drive);
 
         return -1;
 }
diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c
index 9847a4ff7d40..b2c7b6e3edd5 100644
--- a/drivers/ide/pci/pdc202xx_old.c
+++ b/drivers/ide/pci/pdc202xx_old.c
@@ -184,8 +184,7 @@ static int pdc202xx_config_drive_xfer_rate (ide_drive_t *drive)
         if (ide_tune_dma(drive))
                 return 0;
 
-        if (ide_use_fast_pio(drive))
-                ide_set_max_pio(drive);
+        ide_set_max_pio(drive);
 
         return -1;
 }
diff --git a/drivers/ide/pci/piix.c b/drivers/ide/pci/piix.c
index 4dd1b6d0acb5..dcb0701f10b5 100644
--- a/drivers/ide/pci/piix.c
+++ b/drivers/ide/pci/piix.c
@@ -267,8 +267,7 @@ static int piix_config_drive_xfer_rate (ide_drive_t *drive)
         if (ide_tune_dma(drive))
                 return 0;
 
-        if (ide_use_fast_pio(drive))
-                ide_set_max_pio(drive);
+        ide_set_max_pio(drive);
 
         return -1;
 }
diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c
index 67f06dd11b34..f839bdeb903b 100644
--- a/drivers/ide/pci/scc_pata.c
+++ b/drivers/ide/pci/scc_pata.c
@@ -299,8 +299,7 @@ static int scc_config_drive_for_dma(ide_drive_t *drive)
         if (ide_tune_dma(drive))
                 return 0;
 
-        if (ide_use_fast_pio(drive))
-                ide_set_max_pio(drive);
+        ide_set_max_pio(drive);
 
         return -1;
 }
diff --git a/drivers/ide/pci/serverworks.c b/drivers/ide/pci/serverworks.c
index b7076f4569a4..4666e4c1597b 100644
--- a/drivers/ide/pci/serverworks.c
+++ b/drivers/ide/pci/serverworks.c
@@ -201,8 +201,7 @@ static int svwks_config_drive_xfer_rate (ide_drive_t *drive)
         if (ide_tune_dma(drive))
                 return 0;
 
-        if (ide_use_fast_pio(drive))
-                ide_set_max_pio(drive);
+        ide_set_max_pio(drive);
 
         return -1;
 }
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
index ce7784996d12..8be36f3b69a8 100644
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
@@ -326,8 +326,7 @@ static int siimage_config_drive_for_dma (ide_drive_t *drive)
         if (ide_tune_dma(drive))
                 return 0;
 
-        if (ide_use_fast_pio(drive))
-                ide_set_max_pio(drive);
+        ide_set_max_pio(drive);
 
         return -1;
 }
diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c
index 99fe0b682724..5458c56e69b0 100644
--- a/drivers/ide/pci/sis5513.c
+++ b/drivers/ide/pci/sis5513.c
@@ -606,8 +606,7 @@ static int sis5513_config_xfer_rate(ide_drive_t *drive)
         if (ide_tune_dma(drive))
                 return 0;
 
-        if (ide_use_fast_pio(drive))
-                ide_set_max_pio(drive);
+        ide_set_max_pio(drive);
 
         return -1;
 }
diff --git a/drivers/ide/pci/slc90e66.c b/drivers/ide/pci/slc90e66.c
index 38da0659ec07..41c5c571f6bd 100644
--- a/drivers/ide/pci/slc90e66.c
+++ b/drivers/ide/pci/slc90e66.c
@@ -135,8 +135,7 @@ static int slc90e66_config_drive_xfer_rate (ide_drive_t *drive)
         if (ide_tune_dma(drive))
                 return 0;
 
-        if (ide_use_fast_pio(drive))
-                ide_set_max_pio(drive);
+        ide_set_max_pio(drive);
 
         return -1;
 }
diff --git a/drivers/ide/pci/tc86c001.c b/drivers/ide/pci/tc86c001.c
index 840415d68d38..e66e7883ebe2 100644
--- a/drivers/ide/pci/tc86c001.c
+++ b/drivers/ide/pci/tc86c001.c
@@ -167,8 +167,7 @@ static int tc86c001_config_drive_xfer_rate(ide_drive_t *drive)
         if (ide_tune_dma(drive))
                 return 0;
 
-        if (ide_use_fast_pio(drive))
-                ide_set_max_pio(drive);
+        ide_set_max_pio(drive);
 
         return -1;
 }
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 30a1931466a6..86c5907db2a4 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1380,7 +1380,6 @@ static inline void ide_set_hwifdata (ide_hwif_t * hwif, void *data)
 extern char *ide_xfer_verbose(u8 xfer_rate);
 extern void ide_toggle_bounce(ide_drive_t *drive, int on);
 extern int ide_set_xfer_rate(ide_drive_t *drive, u8 rate);
-int ide_use_fast_pio(ide_drive_t *);
 
 static inline int ide_dev_has_iordy(struct hd_driveid *id)
 {