diff options
Diffstat (limited to 'drivers/ide/qd65xx.c')
-rw-r--r-- | drivers/ide/qd65xx.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/ide/qd65xx.c b/drivers/ide/qd65xx.c index 74696edc8d1d..3f0244fd8e62 100644 --- a/drivers/ide/qd65xx.c +++ b/drivers/ide/qd65xx.c | |||
@@ -189,15 +189,13 @@ static void qd_set_timing (ide_drive_t *drive, u8 timing) | |||
189 | printk(KERN_DEBUG "%s: %#x\n", drive->name, timing); | 189 | printk(KERN_DEBUG "%s: %#x\n", drive->name, timing); |
190 | } | 190 | } |
191 | 191 | ||
192 | static void qd6500_set_pio_mode(ide_drive_t *drive, const u8 pio) | 192 | static void qd6500_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive) |
193 | { | 193 | { |
194 | u16 *id = drive->id; | 194 | u16 *id = drive->id; |
195 | int active_time = 175; | 195 | int active_time = 175; |
196 | int recovery_time = 415; /* worst case values from the dos driver */ | 196 | int recovery_time = 415; /* worst case values from the dos driver */ |
197 | 197 | ||
198 | /* | 198 | /* FIXME: use drive->pio_mode value */ |
199 | * FIXME: use "pio" value | ||
200 | */ | ||
201 | if (!qd_find_disk_type(drive, &active_time, &recovery_time) && | 199 | if (!qd_find_disk_type(drive, &active_time, &recovery_time) && |
202 | (id[ATA_ID_OLD_PIO_MODES] & 0xff) && (id[ATA_ID_FIELD_VALID] & 2) && | 200 | (id[ATA_ID_OLD_PIO_MODES] & 0xff) && (id[ATA_ID_FIELD_VALID] & 2) && |
203 | id[ATA_ID_EIDE_PIO] >= 240) { | 201 | id[ATA_ID_EIDE_PIO] >= 240) { |
@@ -211,9 +209,9 @@ static void qd6500_set_pio_mode(ide_drive_t *drive, const u8 pio) | |||
211 | active_time, recovery_time)); | 209 | active_time, recovery_time)); |
212 | } | 210 | } |
213 | 211 | ||
214 | static void qd6580_set_pio_mode(ide_drive_t *drive, const u8 pio) | 212 | static void qd6580_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive) |
215 | { | 213 | { |
216 | ide_hwif_t *hwif = drive->hwif; | 214 | const u8 pio = drive->pio_mode - XFER_PIO_0; |
217 | struct ide_timing *t = ide_timing_find_mode(XFER_PIO_0 + pio); | 215 | struct ide_timing *t = ide_timing_find_mode(XFER_PIO_0 + pio); |
218 | unsigned int cycle_time; | 216 | unsigned int cycle_time; |
219 | int active_time = 175; | 217 | int active_time = 175; |