aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/pata_pdc2027x.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ata/pata_pdc2027x.c')
-rw-r--r--drivers/ata/pata_pdc2027x.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/ata/pata_pdc2027x.c b/drivers/ata/pata_pdc2027x.c
index d235c9f92d09..0e1c2c1134d3 100644
--- a/drivers/ata/pata_pdc2027x.c
+++ b/drivers/ata/pata_pdc2027x.c
@@ -248,7 +248,7 @@ static int pdc2027x_prereset(struct ata_link *link, unsigned long deadline)
248 /* Check whether port enabled */ 248 /* Check whether port enabled */
249 if (!pdc2027x_port_enabled(link->ap)) 249 if (!pdc2027x_port_enabled(link->ap))
250 return -ENOENT; 250 return -ENOENT;
251 return ata_std_prereset(link, deadline); 251 return ata_sff_prereset(link, deadline);
252} 252}
253 253
254/** 254/**
@@ -265,7 +265,7 @@ static unsigned long pdc2027x_mode_filter(struct ata_device *adev, unsigned long
265 struct ata_device *pair = ata_dev_pair(adev); 265 struct ata_device *pair = ata_dev_pair(adev);
266 266
267 if (adev->class != ATA_DEV_ATA || adev->devno == 0 || pair == NULL) 267 if (adev->class != ATA_DEV_ATA || adev->devno == 0 || pair == NULL)
268 return ata_pci_default_filter(adev, mask); 268 return ata_bmdma_mode_filter(adev, mask);
269 269
270 /* Check for slave of a Maxtor at UDMA6 */ 270 /* Check for slave of a Maxtor at UDMA6 */
271 ata_id_c_string(pair->id, model_num, ATA_ID_PROD, 271 ata_id_c_string(pair->id, model_num, ATA_ID_PROD,
@@ -274,7 +274,7 @@ static unsigned long pdc2027x_mode_filter(struct ata_device *adev, unsigned long
274 if (strstr(model_num, "Maxtor") == NULL && pair->dma_mode == XFER_UDMA_6) 274 if (strstr(model_num, "Maxtor") == NULL && pair->dma_mode == XFER_UDMA_6)
275 mask &= ~ (1 << (6 + ATA_SHIFT_UDMA)); 275 mask &= ~ (1 << (6 + ATA_SHIFT_UDMA));
276 276
277 return ata_pci_default_filter(adev, mask); 277 return ata_bmdma_mode_filter(adev, mask);
278} 278}
279 279
280/** 280/**
@@ -759,8 +759,8 @@ static int __devinit pdc2027x_init_one(struct pci_dev *pdev, const struct pci_de
759 return -EIO; 759 return -EIO;
760 760
761 pci_set_master(pdev); 761 pci_set_master(pdev);
762 return ata_host_activate(host, pdev->irq, ata_interrupt, IRQF_SHARED, 762 return ata_host_activate(host, pdev->irq, ata_sff_interrupt,
763 &pdc2027x_sht); 763 IRQF_SHARED, &pdc2027x_sht);
764} 764}
765 765
766/** 766/**