diff options
Diffstat (limited to 'drivers/ide/pci/aec62xx.c')
-rw-r--r-- | drivers/ide/pci/aec62xx.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c index b173bc66ce1e..bed32d0eaa37 100644 --- a/drivers/ide/pci/aec62xx.c +++ b/drivers/ide/pci/aec62xx.c | |||
@@ -172,12 +172,9 @@ static int aec62xx_config_drive_xfer_rate (ide_drive_t *drive) | |||
172 | return -1; | 172 | return -1; |
173 | } | 173 | } |
174 | 174 | ||
175 | static int aec62xx_irq_timeout (ide_drive_t *drive) | 175 | static void aec62xx_dma_lost_irq (ide_drive_t *drive) |
176 | { | 176 | { |
177 | ide_hwif_t *hwif = HWIF(drive); | 177 | switch (HWIF(drive)->pci_dev->device) { |
178 | struct pci_dev *dev = hwif->pci_dev; | ||
179 | |||
180 | switch(dev->device) { | ||
181 | case PCI_DEVICE_ID_ARTOP_ATP860: | 178 | case PCI_DEVICE_ID_ARTOP_ATP860: |
182 | case PCI_DEVICE_ID_ARTOP_ATP860R: | 179 | case PCI_DEVICE_ID_ARTOP_ATP860R: |
183 | case PCI_DEVICE_ID_ARTOP_ATP865: | 180 | case PCI_DEVICE_ID_ARTOP_ATP865: |
@@ -186,7 +183,6 @@ static int aec62xx_irq_timeout (ide_drive_t *drive) | |||
186 | default: | 183 | default: |
187 | break; | 184 | break; |
188 | } | 185 | } |
189 | return 0; | ||
190 | } | 186 | } |
191 | 187 | ||
192 | static unsigned int __devinit init_chipset_aec62xx(struct pci_dev *dev, const char *name) | 188 | static unsigned int __devinit init_chipset_aec62xx(struct pci_dev *dev, const char *name) |
@@ -254,7 +250,7 @@ static void __devinit init_hwif_aec62xx(ide_hwif_t *hwif) | |||
254 | hwif->mwdma_mask = 0x07; | 250 | hwif->mwdma_mask = 0x07; |
255 | 251 | ||
256 | hwif->ide_dma_check = &aec62xx_config_drive_xfer_rate; | 252 | hwif->ide_dma_check = &aec62xx_config_drive_xfer_rate; |
257 | hwif->ide_dma_lostirq = &aec62xx_irq_timeout; | 253 | hwif->dma_lost_irq = &aec62xx_dma_lost_irq; |
258 | 254 | ||
259 | if (!noautodma) | 255 | if (!noautodma) |
260 | hwif->autodma = 1; | 256 | hwif->autodma = 1; |