Browse Source

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>
Bartlomiej Zolnierkiewicz 17 years ago
parent
commit
b32b76f72d
2 changed files with 4 additions and 4 deletions
  1. 1 0
      drivers/ide/Kconfig
  2. 3 4
      drivers/ide/legacy/ht6560b.c

+ 1 - 0
drivers/ide/Kconfig

@@ -1001,6 +1001,7 @@ config BLK_DEV_DTC2278
 
 
 config BLK_DEV_HT6560B
 config BLK_DEV_HT6560B
 	tristate "Holtek HT6560B support"
 	tristate "Holtek HT6560B support"
+	select IDE_TIMINGS
 	help
 	help
 	  This driver is enabled at runtime using the "ht6560b.probe" kernel
 	  This driver is enabled at runtime using the "ht6560b.probe" kernel
 	  boot parameter. It enables support for the secondary IDE interface
 	  boot parameter. It enables support for the secondary IDE interface

+ 3 - 4
drivers/ide/legacy/ht6560b.c

@@ -216,6 +216,7 @@ static u8 ht_pio2timings(ide_drive_t *drive, const u8 pio)
 
 
         if (pio) {
         if (pio) {
 		unsigned int cycle_time;
 		unsigned int cycle_time;
+		struct ide_timing *t = ide_timing_find_mode(XFER_PIO_0 + pio);
 
 
 		cycle_time = ide_pio_cycle_time(drive, 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
 		 *  actual cycle time for recovery and activity
 		 *  according system bus speed.
 		 *  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
 		 *  Cycle times should be Vesa bus cycles
 		 */
 		 */