diff options
Diffstat (limited to 'drivers/ide/pci/cmd64x.c')
-rw-r--r-- | drivers/ide/pci/cmd64x.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c index 8150a023dd7a..c383f6dc67dd 100644 --- a/drivers/ide/pci/cmd64x.c +++ b/drivers/ide/pci/cmd64x.c | |||
@@ -221,16 +221,18 @@ static u8 cmd64x_tune_pio (ide_drive_t *drive, u8 mode_wanted) | |||
221 | { | 221 | { |
222 | ide_hwif_t *hwif = HWIF(drive); | 222 | ide_hwif_t *hwif = HWIF(drive); |
223 | struct pci_dev *dev = hwif->pci_dev; | 223 | struct pci_dev *dev = hwif->pci_dev; |
224 | ide_pio_data_t pio; | 224 | unsigned int cycle_time; |
225 | u8 pio_mode, setup_count, arttim = 0; | 225 | u8 pio_mode, setup_count, arttim = 0; |
226 | static const u8 setup_values[] = {0x40, 0x40, 0x40, 0x80, 0, 0xc0}; | 226 | static const u8 setup_values[] = {0x40, 0x40, 0x40, 0x80, 0, 0xc0}; |
227 | static const u8 arttim_regs[4] = {ARTTIM0, ARTTIM1, ARTTIM23, ARTTIM23}; | 227 | static const u8 arttim_regs[4] = {ARTTIM0, ARTTIM1, ARTTIM23, ARTTIM23}; |
228 | pio_mode = ide_get_best_pio_mode(drive, mode_wanted, 5, &pio); | 228 | |
229 | pio_mode = ide_get_best_pio_mode(drive, mode_wanted, 5, NULL); | ||
230 | cycle_time = ide_pio_cycle_time(drive, pio_mode); | ||
229 | 231 | ||
230 | cmdprintk("%s: PIO mode wanted %d, selected %d (%d ns)\n", | 232 | cmdprintk("%s: PIO mode wanted %d, selected %d (%d ns)\n", |
231 | drive->name, mode_wanted, pio_mode, pio.cycle_time); | 233 | drive->name, mode_wanted, pio_mode, cycle_time); |
232 | 234 | ||
233 | program_cycle_times(drive, pio.cycle_time, | 235 | program_cycle_times(drive, cycle_time, |
234 | ide_pio_timings[pio_mode].active_time); | 236 | ide_pio_timings[pio_mode].active_time); |
235 | 237 | ||
236 | setup_count = quantize_timing(ide_pio_timings[pio_mode].setup_time, | 238 | setup_count = quantize_timing(ide_pio_timings[pio_mode].setup_time, |