aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/pci/pdc202xx_old.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/pci/pdc202xx_old.c')
-rw-r--r--drivers/ide/pci/pdc202xx_old.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c
index e7a5e3014c09..b578307fad51 100644
--- a/drivers/ide/pci/pdc202xx_old.c
+++ b/drivers/ide/pci/pdc202xx_old.c
@@ -142,9 +142,8 @@ static int pdc202xx_tune_chipset(ide_drive_t *drive, const u8 speed)
142 return ide_config_drive_speed(drive, speed); 142 return ide_config_drive_speed(drive, speed);
143} 143}
144 144
145static void pdc202xx_tune_drive(ide_drive_t *drive, u8 pio) 145static void pdc202xx_set_pio_mode(ide_drive_t *drive, const u8 pio)
146{ 146{
147 pio = ide_get_best_pio_mode(drive, pio, 4);
148 pdc202xx_tune_chipset(drive, XFER_PIO_0 + pio); 147 pdc202xx_tune_chipset(drive, XFER_PIO_0 + pio);
149} 148}
150 149
@@ -190,7 +189,7 @@ static int pdc202xx_config_drive_xfer_rate (ide_drive_t *drive)
190 return 0; 189 return 0;
191 190
192 if (ide_use_fast_pio(drive)) 191 if (ide_use_fast_pio(drive))
193 pdc202xx_tune_drive(drive, 255); 192 ide_set_max_pio(drive);
194 193
195 return -1; 194 return -1;
196} 195}
@@ -306,10 +305,11 @@ static void pdc202xx_reset (ide_drive_t *drive)
306{ 305{
307 ide_hwif_t *hwif = HWIF(drive); 306 ide_hwif_t *hwif = HWIF(drive);
308 ide_hwif_t *mate = hwif->mate; 307 ide_hwif_t *mate = hwif->mate;
309 308
310 pdc202xx_reset_host(hwif); 309 pdc202xx_reset_host(hwif);
311 pdc202xx_reset_host(mate); 310 pdc202xx_reset_host(mate);
312 pdc202xx_tune_drive(drive, 255); 311
312 ide_set_max_pio(drive);
313} 313}
314 314
315static unsigned int __devinit init_chipset_pdc202xx(struct pci_dev *dev, 315static unsigned int __devinit init_chipset_pdc202xx(struct pci_dev *dev,
@@ -328,7 +328,9 @@ static void __devinit init_hwif_pdc202xx(ide_hwif_t *hwif)
328 hwif->rqsize = 256; 328 hwif->rqsize = 256;
329 329
330 hwif->autodma = 0; 330 hwif->autodma = 0;
331 hwif->tuneproc = &pdc202xx_tune_drive; 331
332 hwif->set_pio_mode = &pdc202xx_set_pio_mode;
333
332 hwif->quirkproc = &pdc202xx_quirkproc; 334 hwif->quirkproc = &pdc202xx_quirkproc;
333 335
334 if (hwif->pci_dev->device != PCI_DEVICE_ID_PROMISE_20246) 336 if (hwif->pci_dev->device != PCI_DEVICE_ID_PROMISE_20246)