[PATCH 09/21] ht6560b: convert to use ide_timing_find_mode()

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Bartlomiej Zolnierkiewicz
Date: Wednesday, May 28, 2008 - 2:41 pm

There should be no functional changes caused by this patch.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---
 drivers/ide/Kconfig          |    1 +
 drivers/ide/legacy/ht6560b.c |    7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

Index: b/drivers/ide/Kconfig
===================================================================
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -1008,6 +1008,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
Index: b/drivers/ide/legacy/ht6560b.c
===================================================================
--- a/drivers/ide/legacy/ht6560b.c
+++ b/drivers/ide/legacy/ht6560b.c
@@ -216,6 +216,7 @@ static u8 ht_pio2timings(ide_drive_t *dr
 
         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 *dr
 		 *  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
 		 */
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 00/21] ide: convert ide-timing.h to ide-timings.c l ..., Bartlomiej Zolnierki ..., (Wed May 28, 2:39 pm)
[PATCH 01/21] ide: remove needless includes from ide-lib.c, Bartlomiej Zolnierki ..., (Wed May 28, 2:39 pm)
[PATCH 02/21] ide: remove unused XFER_UDMA_SLOW, Bartlomiej Zolnierki ..., (Wed May 28, 2:40 pm)
[PATCH 03/21] ide: use u8 for xfer modes in ide-timing.h, Bartlomiej Zolnierki ..., (Wed May 28, 2:40 pm)
[PATCH 04/21] ide: move some bits from ide-timing.h to &lt;li ..., Bartlomiej Zolnierki ..., (Wed May 28, 2:40 pm)
[PATCH 05/21] ide: remove XFER_* masks from ide-timing.h, Bartlomiej Zolnierki ..., (Wed May 28, 2:40 pm)
[PATCH 06/21] ide: checkpatch.pl fixes for ide-timing.h, Bartlomiej Zolnierki ..., (Wed May 28, 2:40 pm)
[PATCH 07/21] ide: convert ide-timing.h to ide-timings.c l ..., Bartlomiej Zolnierki ..., (Wed May 28, 2:40 pm)
[PATCH 08/21] ali14xx: convert to use ide_timing_find_mode(), Bartlomiej Zolnierki ..., (Wed May 28, 2:40 pm)
[PATCH 09/21] ht6560b: convert to use ide_timing_find_mode(), Bartlomiej Zolnierki ..., (Wed May 28, 2:41 pm)
[PATCH 10/21] qd65xx: convert to use ide_timing_find_mode(), Bartlomiej Zolnierki ..., (Wed May 28, 2:42 pm)
[PATCH 11/21] alim15x3: convert to use ide_timing_find_mode(), Bartlomiej Zolnierki ..., (Wed May 28, 2:42 pm)
[PATCH 12/21] cmd640: convert to use ide_timing_find_mode(), Bartlomiej Zolnierki ..., (Wed May 28, 2:42 pm)
[PATCH 13/21] cmd64x: convert to use ide_timing_find_mode(), Bartlomiej Zolnierki ..., (Wed May 28, 2:42 pm)
[PATCH 14/21] cy82c693: convert to use ide_timing_find_mode(), Bartlomiej Zolnierki ..., (Wed May 28, 2:42 pm)
[PATCH 15/21] opti621: convert to use ide_timing_find_mode(), Bartlomiej Zolnierki ..., (Wed May 28, 2:42 pm)
[PATCH 16/21] sl82c105: convert to use ide_timing_find_mode(), Bartlomiej Zolnierki ..., (Wed May 28, 2:42 pm)
[PATCH 17/21] ide-mpc8xx: convert to use ide_timing_find_m ..., Bartlomiej Zolnierki ..., (Wed May 28, 2:43 pm)
[PATCH 18/21] ide-pmac: convert to use ide_timing_find_mode(), Bartlomiej Zolnierki ..., (Wed May 28, 2:43 pm)
[PATCH 19/21] ide: move ide_pio_cycle_time() to ide-timings.c, Bartlomiej Zolnierki ..., (Wed May 28, 2:43 pm)
[PATCH 20/21] ide: remove no longer used ide_pio_timings[], Bartlomiej Zolnierki ..., (Wed May 28, 2:43 pm)
[PATCH 21/21] ide: move PIO blacklist to ide-pio-blacklist.c, Bartlomiej Zolnierki ..., (Wed May 28, 2:43 pm)
Re: [PATCH 05/21] ide: remove XFER_* masks from ide-timing.h, Sergei Shtylyov, (Fri May 30, 4:46 am)
Re: [PATCH 06/21] ide: checkpatch.pl fixes for ide-timing.h, Sergei Shtylyov, (Fri May 30, 4:46 am)
Re: [PATCH 02/21] ide: remove unused XFER_UDMA_SLOW, Sergei Shtylyov, (Mon Jun 2, 4:43 am)