diff options
Diffstat (limited to 'drivers/ide/pci/pdc202xx_old.c')
-rw-r--r-- | drivers/ide/pci/pdc202xx_old.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c index 31a1308414a0..41853a1bc913 100644 --- a/drivers/ide/pci/pdc202xx_old.c +++ b/drivers/ide/pci/pdc202xx_old.c | |||
@@ -140,7 +140,7 @@ static void pdc202xx_set_pio_mode(ide_drive_t *drive, const u8 pio) | |||
140 | pdc202xx_set_mode(drive, XFER_PIO_0 + pio); | 140 | pdc202xx_set_mode(drive, XFER_PIO_0 + pio); |
141 | } | 141 | } |
142 | 142 | ||
143 | static u8 pdc202xx_old_cable_detect (ide_hwif_t *hwif) | 143 | static u8 __devinit pdc2026x_old_cable_detect(ide_hwif_t *hwif) |
144 | { | 144 | { |
145 | struct pci_dev *dev = to_pci_dev(hwif->dev); | 145 | struct pci_dev *dev = to_pci_dev(hwif->dev); |
146 | u16 CIS = 0, mask = (hwif->channel) ? (1<<11) : (1<<10); | 146 | u16 CIS = 0, mask = (hwif->channel) ? (1<<11) : (1<<10); |
@@ -311,9 +311,12 @@ static void __devinit init_hwif_pdc202xx(ide_hwif_t *hwif) | |||
311 | 311 | ||
312 | hwif->quirkproc = &pdc202xx_quirkproc; | 312 | hwif->quirkproc = &pdc202xx_quirkproc; |
313 | 313 | ||
314 | if (dev->device != PCI_DEVICE_ID_PROMISE_20246) | 314 | if (dev->device != PCI_DEVICE_ID_PROMISE_20246) { |
315 | hwif->resetproc = &pdc202xx_reset; | 315 | hwif->resetproc = &pdc202xx_reset; |
316 | 316 | ||
317 | hwif->cable_detect = pdc2026x_old_cable_detect; | ||
318 | } | ||
319 | |||
317 | if (hwif->dma_base == 0) | 320 | if (hwif->dma_base == 0) |
318 | return; | 321 | return; |
319 | 322 | ||
@@ -321,9 +324,6 @@ static void __devinit init_hwif_pdc202xx(ide_hwif_t *hwif) | |||
321 | hwif->dma_timeout = &pdc202xx_dma_timeout; | 324 | hwif->dma_timeout = &pdc202xx_dma_timeout; |
322 | 325 | ||
323 | if (dev->device != PCI_DEVICE_ID_PROMISE_20246) { | 326 | if (dev->device != PCI_DEVICE_ID_PROMISE_20246) { |
324 | if (hwif->cbl != ATA_CBL_PATA40_SHORT) | ||
325 | hwif->cbl = pdc202xx_old_cable_detect(hwif); | ||
326 | |||
327 | hwif->dma_start = &pdc202xx_old_ide_dma_start; | 327 | hwif->dma_start = &pdc202xx_old_ide_dma_start; |
328 | hwif->ide_dma_end = &pdc202xx_old_ide_dma_end; | 328 | hwif->ide_dma_end = &pdc202xx_old_ide_dma_end; |
329 | } | 329 | } |