ht6560b: convert to use ide_timing_find_mode()

There should be no functional changes caused by this patch.

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

2 files changed, 4 insertions, 4 deletions

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index e9afafd55cd0..615e0bc01844 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -1001,6 +1001,7 @@ config BLK_DEV_DTC2278
 
 config BLK_DEV_HT6560B
         tristate "Holtek HT6560B support"
+        select IDE_TIMINGS
         help
           This driver is enabled at runtime using the "ht6560b.probe" kernel
           boot parameter. It enables support for the secondary IDE interface
diff --git a/drivers/ide/legacy/ht6560b.c b/drivers/ide/legacy/ht6560b.c
index dd6dfb32e853..bd2f579946fa 100644
--- a/drivers/ide/legacy/ht6560b.c
+++ b/drivers/ide/legacy/ht6560b.c
@@ -216,6 +216,7 @@ static u8 ht_pio2timings(ide_drive_t *drive, const u8 pio)
 
         if (pio) {
                 unsigned int cycle_time;
+                struct ide_timing *t = ide_timing_find_mode(XFER_PIO_0 + pio);
 
                 cycle_time = ide_pio_cycle_time(drive, pio);
 
@@ -224,10 +225,8 @@ static u8 ht_pio2timings(ide_drive_t *drive, const u8 pio)
                  *  actual cycle time for recovery and activity
                  *  according system bus speed.
                  */
-                active_time = ide_pio_timings[pio].active_time;
-                recovery_time = cycle_time
-                        - active_time
-                        - ide_pio_timings[pio].setup_time;
+                active_time = t->active;
+                recovery_time = cycle_time - active_time - t->setup;
                 /*
                  *  Cycle times should be Vesa bus cycles
                  */