diff options
Diffstat (limited to 'drivers/ide/pci/pdc202xx_old.c')
-rw-r--r-- | drivers/ide/pci/pdc202xx_old.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c index b578307fad51..8c3e8cf36ec9 100644 --- a/drivers/ide/pci/pdc202xx_old.c +++ b/drivers/ide/pci/pdc202xx_old.c | |||
@@ -63,7 +63,7 @@ static const char *pdc_quirk_drives[] = { | |||
63 | 63 | ||
64 | static void pdc_old_disable_66MHz_clock(ide_hwif_t *); | 64 | static void pdc_old_disable_66MHz_clock(ide_hwif_t *); |
65 | 65 | ||
66 | static int pdc202xx_tune_chipset(ide_drive_t *drive, const u8 speed) | 66 | static void pdc202xx_set_mode(ide_drive_t *drive, const u8 speed) |
67 | { | 67 | { |
68 | ide_hwif_t *hwif = HWIF(drive); | 68 | ide_hwif_t *hwif = HWIF(drive); |
69 | struct pci_dev *dev = hwif->pci_dev; | 69 | struct pci_dev *dev = hwif->pci_dev; |
@@ -138,13 +138,11 @@ static int pdc202xx_tune_chipset(ide_drive_t *drive, const u8 speed) | |||
138 | pci_read_config_dword(dev, drive_pci, &drive_conf); | 138 | pci_read_config_dword(dev, drive_pci, &drive_conf); |
139 | printk("0x%08x\n", drive_conf); | 139 | printk("0x%08x\n", drive_conf); |
140 | #endif | 140 | #endif |
141 | |||
142 | return ide_config_drive_speed(drive, speed); | ||
143 | } | 141 | } |
144 | 142 | ||
145 | static void pdc202xx_set_pio_mode(ide_drive_t *drive, const u8 pio) | 143 | static void pdc202xx_set_pio_mode(ide_drive_t *drive, const u8 pio) |
146 | { | 144 | { |
147 | pdc202xx_tune_chipset(drive, XFER_PIO_0 + pio); | 145 | pdc202xx_set_mode(drive, XFER_PIO_0 + pio); |
148 | } | 146 | } |
149 | 147 | ||
150 | static u8 pdc202xx_old_cable_detect (ide_hwif_t *hwif) | 148 | static u8 pdc202xx_old_cable_detect (ide_hwif_t *hwif) |
@@ -330,14 +328,13 @@ static void __devinit init_hwif_pdc202xx(ide_hwif_t *hwif) | |||
330 | hwif->autodma = 0; | 328 | hwif->autodma = 0; |
331 | 329 | ||
332 | hwif->set_pio_mode = &pdc202xx_set_pio_mode; | 330 | hwif->set_pio_mode = &pdc202xx_set_pio_mode; |
331 | hwif->set_dma_mode = &pdc202xx_set_mode; | ||
333 | 332 | ||
334 | hwif->quirkproc = &pdc202xx_quirkproc; | 333 | hwif->quirkproc = &pdc202xx_quirkproc; |
335 | 334 | ||
336 | if (hwif->pci_dev->device != PCI_DEVICE_ID_PROMISE_20246) | 335 | if (hwif->pci_dev->device != PCI_DEVICE_ID_PROMISE_20246) |
337 | hwif->resetproc = &pdc202xx_reset; | 336 | hwif->resetproc = &pdc202xx_reset; |
338 | 337 | ||
339 | hwif->speedproc = &pdc202xx_tune_chipset; | ||
340 | |||
341 | hwif->err_stops_fifo = 1; | 338 | hwif->err_stops_fifo = 1; |
342 | 339 | ||
343 | hwif->drives[0].autotune = hwif->drives[1].autotune = 1; | 340 | hwif->drives[0].autotune = hwif->drives[1].autotune = 1; |