diff options
Diffstat (limited to 'drivers/ide/pci/amd74xx.c')
-rw-r--r-- | drivers/ide/pci/amd74xx.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c index 8c52bc9eaa59..d6d58d217142 100644 --- a/drivers/ide/pci/amd74xx.c +++ b/drivers/ide/pci/amd74xx.c | |||
@@ -199,6 +199,14 @@ static unsigned int __devinit init_chipset_amd74xx(struct pci_dev *dev, | |||
199 | return dev->irq; | 199 | return dev->irq; |
200 | } | 200 | } |
201 | 201 | ||
202 | static u8 __devinit amd_cable_detect(ide_hwif_t *hwif) | ||
203 | { | ||
204 | if ((amd_80w >> hwif->channel) & 1) | ||
205 | return ATA_CBL_PATA80; | ||
206 | else | ||
207 | return ATA_CBL_PATA40; | ||
208 | } | ||
209 | |||
202 | static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif) | 210 | static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif) |
203 | { | 211 | { |
204 | struct pci_dev *dev = to_pci_dev(hwif->dev); | 212 | struct pci_dev *dev = to_pci_dev(hwif->dev); |
@@ -209,15 +217,7 @@ static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif) | |||
209 | hwif->set_pio_mode = &amd_set_pio_mode; | 217 | hwif->set_pio_mode = &amd_set_pio_mode; |
210 | hwif->set_dma_mode = &amd_set_drive; | 218 | hwif->set_dma_mode = &amd_set_drive; |
211 | 219 | ||
212 | if (!hwif->dma_base) | 220 | hwif->cable_detect = amd_cable_detect; |
213 | return; | ||
214 | |||
215 | if (hwif->cbl != ATA_CBL_PATA40_SHORT) { | ||
216 | if ((amd_80w >> hwif->channel) & 1) | ||
217 | hwif->cbl = ATA_CBL_PATA80; | ||
218 | else | ||
219 | hwif->cbl = ATA_CBL_PATA40; | ||
220 | } | ||
221 | } | 221 | } |
222 | 222 | ||
223 | #define IDE_HFLAGS_AMD \ | 223 | #define IDE_HFLAGS_AMD \ |