1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/ata/pata_oldpiix.c b/drivers/ata/pata_oldpiix.c
index c1da79a76439..e678af383d13 100644
--- a/drivers/ata/pata_oldpiix.c
+++ b/drivers/ata/pata_oldpiix.c
@@ -47,7 +47,7 @@ static int oldpiix_pre_reset(struct ata_link *link, unsigned long deadline)
         if (!pci_test_config_bits(pdev, &oldpiix_enable_bits[ap->port_no]))
                 return -ENOENT;
 
-        return ata_std_prereset(link, deadline);
+        return ata_sff_prereset(link, deadline);
 }
 
 /**
@@ -181,7 +181,7 @@ static void oldpiix_set_dmamode (struct ata_port *ap, struct ata_device *adev)
 }
 
 /**
- *      oldpiix_qc_issue_prot   -       command issue
+ *      oldpiix_qc_issue        -       command issue
  *      @qc: command pending
  *
  *      Called when the libata layer is about to issue a command. We wrap
@@ -191,7 +191,7 @@ static void oldpiix_set_dmamode (struct ata_port *ap, struct ata_device *adev)
  *      be made PIO0.
  */
 
-static unsigned int oldpiix_qc_issue_prot(struct ata_queued_cmd *qc)
+static unsigned int oldpiix_qc_issue(struct ata_queued_cmd *qc)
 {
         struct ata_port *ap = qc->ap;
         struct ata_device *adev = qc->dev;
@@ -201,7 +201,7 @@ static unsigned int oldpiix_qc_issue_prot(struct ata_queued_cmd *qc)
                 if (adev->dma_mode)
                         oldpiix_set_dmamode(ap, adev);
         }
-        return ata_qc_issue_prot(qc);
+        return ata_sff_qc_issue(qc);
 }
 
 
@@ -211,7 +211,7 @@ static struct scsi_host_template oldpiix_sht = {
 
 static struct ata_port_operations oldpiix_pata_ops = {
         .inherits               = &ata_bmdma_port_ops,
-        .qc_issue               = oldpiix_qc_issue_prot,
+        .qc_issue               = oldpiix_qc_issue,
         .cable_detect           = ata_cable_40wire,
         .set_piomode            = oldpiix_set_piomode,
         .set_dmamode            = oldpiix_set_dmamode,
@@ -249,7 +249,7 @@ static int oldpiix_init_one (struct pci_dev *pdev, const struct pci_device_id *e
                 dev_printk(KERN_DEBUG, &pdev->dev,
                            "version " DRV_VERSION "\n");
 
-        return ata_pci_init_one(pdev, ppi, &oldpiix_sht, NULL);
+        return ata_pci_sff_init_one(pdev, ppi, &oldpiix_sht, NULL);
 }
 
 static const struct pci_device_id oldpiix_pci_tbl[] = {