ide: add ide_pio_cycle_time() helper (take 2)

* Add ide_pio_cycle_time() helper.

* Use it in ali14xx/ht6560b/qd65xx/cmd64{0,x}/sl82c105 and pmac host drivers
  (previously cycle time given by the device was only used for "pio" == 255).

* Remove no longer needed ide_pio_data_t.cycle_time field.

v2:
* Fix "ata_" prefix (Noticed by Jeff).

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/ide/legacy/qd65xx.c b/drivers/ide/legacy/qd65xx.c
index 7783745dd167..233905b08e93 100644
--- a/drivers/ide/legacy/qd65xx.c
+++ b/drivers/ide/legacy/qd65xx.c
@@ -252,38 +252,38 @@ static void qd6500_tune_drive (ide_drive_t *drive, u8 pio)
 
 static void qd6580_tune_drive (ide_drive_t *drive, u8 pio)
 {
-        ide_pio_data_t d;
         int base = HWIF(drive)->select_data;
+        unsigned int cycle_time;
         int active_time   = 175;
         int recovery_time = 415; /* worst case values from the dos driver */
 
         if (drive->id && !qd_find_disk_type(drive, &active_time, &recovery_time)) {
-                pio = ide_get_best_pio_mode(drive, pio, 4, &d);
+                pio = ide_get_best_pio_mode(drive, pio, 4, NULL);
+                cycle_time = ide_pio_cycle_time(drive, pio);
 
                 switch (pio) {
                         case 0: break;
                         case 3:
-                                if (d.cycle_time >= 110) {
+                                if (cycle_time >= 110) {
                                         active_time = 86;
-                                        recovery_time = d.cycle_time - 102;
+                                        recovery_time = cycle_time - 102;
                                 } else
                                         printk(KERN_WARNING "%s: Strange recovery time !\n",drive->name);
                                 break;
                         case 4:
-                                if (d.cycle_time >= 69) {
+                                if (cycle_time >= 69) {
                                         active_time = 70;
-                                        recovery_time = d.cycle_time - 61;
+                                        recovery_time = cycle_time - 61;
                                 } else
                                         printk(KERN_WARNING "%s: Strange recovery time !\n",drive->name);
                                 break;
                         default:
-                                if (d.cycle_time >= 180) {
+                                if (cycle_time >= 180) {
                                         active_time = 110;
-                                        recovery_time = d.cycle_time - 120;
+                                        recovery_time = cycle_time - 120;
                                 } else {
                                         active_time = ide_pio_timings[pio].active_time;
-                                        recovery_time = d.cycle_time
-                                                        -active_time;
+                                        recovery_time = cycle_time - active_time;
                                 }
                 }
                 printk(KERN_INFO "%s: PIO mode%d\n", drive->name,pio);