diff options
Diffstat (limited to 'drivers/ide/legacy/ali14xx.c')
-rw-r--r-- | drivers/ide/legacy/ali14xx.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/ide/legacy/ali14xx.c b/drivers/ide/legacy/ali14xx.c index df17ed68c0bc..9b9c4761cb7d 100644 --- a/drivers/ide/legacy/ali14xx.c +++ b/drivers/ide/legacy/ali14xx.c | |||
@@ -115,13 +115,12 @@ static void ali14xx_tune_drive (ide_drive_t *drive, u8 pio) | |||
115 | int time1, time2; | 115 | int time1, time2; |
116 | u8 param1, param2, param3, param4; | 116 | u8 param1, param2, param3, param4; |
117 | unsigned long flags; | 117 | unsigned long flags; |
118 | ide_pio_data_t d; | ||
119 | int bus_speed = system_bus_clock(); | 118 | int bus_speed = system_bus_clock(); |
120 | 119 | ||
121 | pio = ide_get_best_pio_mode(drive, pio, ALI_MAX_PIO, &d); | 120 | pio = ide_get_best_pio_mode(drive, pio, ALI_MAX_PIO); |
122 | 121 | ||
123 | /* calculate timing, according to PIO mode */ | 122 | /* calculate timing, according to PIO mode */ |
124 | time1 = d.cycle_time; | 123 | time1 = ide_pio_cycle_time(drive, pio); |
125 | time2 = ide_pio_timings[pio].active_time; | 124 | time2 = ide_pio_timings[pio].active_time; |
126 | param3 = param1 = (time2 * bus_speed + 999) / 1000; | 125 | param3 = param1 = (time2 * bus_speed + 999) / 1000; |
127 | param4 = param2 = (time1 * bus_speed + 999) / 1000 - param1; | 126 | param4 = param2 = (time1 * bus_speed + 999) / 1000 - param1; |
@@ -212,10 +211,12 @@ static int __init ali14xx_probe(void) | |||
212 | mate = &ide_hwifs[1]; | 211 | mate = &ide_hwifs[1]; |
213 | 212 | ||
214 | hwif->chipset = ide_ali14xx; | 213 | hwif->chipset = ide_ali14xx; |
214 | hwif->pio_mask = ATA_PIO4; | ||
215 | hwif->tuneproc = &ali14xx_tune_drive; | 215 | hwif->tuneproc = &ali14xx_tune_drive; |
216 | hwif->mate = mate; | 216 | hwif->mate = mate; |
217 | 217 | ||
218 | mate->chipset = ide_ali14xx; | 218 | mate->chipset = ide_ali14xx; |
219 | mate->pio_mask = ATA_PIO4; | ||
219 | mate->tuneproc = &ali14xx_tune_drive; | 220 | mate->tuneproc = &ali14xx_tune_drive; |
220 | mate->mate = hwif; | 221 | mate->mate = hwif; |
221 | mate->channel = 1; | 222 | mate->channel = 1; |