ali14xx: 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>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2008-07-16 20:33:37 +02:00
parent f06ab3402a
commit cc57ccc03d
2 changed files with 3 additions and 1 deletions

View File

@ -981,6 +981,7 @@ config BLK_DEV_4DRIVES
config BLK_DEV_ALI14XX config BLK_DEV_ALI14XX
tristate "ALI M14xx support" tristate "ALI M14xx support"
select IDE_TIMINGS
help help
This driver is enabled at runtime using the "ali14xx.probe" kernel This driver is enabled at runtime using the "ali14xx.probe" kernel
boot parameter. It enables support for the secondary IDE interface boot parameter. It enables support for the secondary IDE interface

View File

@ -117,10 +117,11 @@ static void ali14xx_set_pio_mode(ide_drive_t *drive, const u8 pio)
u8 param1, param2, param3, param4; u8 param1, param2, param3, param4;
unsigned long flags; unsigned long flags;
int bus_speed = ide_vlb_clk ? ide_vlb_clk : 50; int bus_speed = ide_vlb_clk ? ide_vlb_clk : 50;
struct ide_timing *t = ide_timing_find_mode(XFER_PIO_0 + pio);
/* calculate timing, according to PIO mode */ /* calculate timing, according to PIO mode */
time1 = ide_pio_cycle_time(drive, pio); time1 = ide_pio_cycle_time(drive, pio);
time2 = ide_pio_timings[pio].active_time; time2 = t->active;
param3 = param1 = (time2 * bus_speed + 999) / 1000; param3 = param1 = (time2 * bus_speed + 999) / 1000;
param4 = param2 = (time1 * bus_speed + 999) / 1000 - param1; param4 = param2 = (time1 * bus_speed + 999) / 1000 - param1;
if (pio < 3) { if (pio < 3) {