libata: rename SFF functions

SFF functions have confusing names.  Some have sff prefix, some have
bmdma, some std, some pci and some none.  Unify the naming by...

* SFF functions which are common to both BMDMA and non-BMDMA are
  prefixed with ata_sff_.

* SFF functions which are specific to BMDMA are prefixed with
  ata_bmdma_.

* SFF functions which are specific to PCI but apply to both BMDMA and
  non-BMDMA are prefixed with ata_pci_sff_.

* SFF functions which are specific to PCI and BMDMA are prefixed with
  ata_pci_bmdma_.

* Drop generic prefixes from LLD specific routines.  For example,
  bfin_std_dev_select -> bfin_dev_select.

The following renames are noteworthy.

  ata_qc_issue_prot() -> ata_sff_qc_issue()
  ata_pci_default_filter() -> ata_bmdma_mode_filter()
  ata_dev_try_classify() -> ata_sff_dev_classify()

This rename is in preparation of separating SFF support out of libata
core layer.  This patch strictly renames functions and doesn't
introduce any behavior difference.

Signed-off-by: Tejun Heo <htejun@gmail.com>

1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/ata/pata_qdi.c b/drivers/ata/pata_qdi.c
index d16b343d2a62..0d81dd5fdc38 100644
--- a/drivers/ata/pata_qdi.c
+++ b/drivers/ata/pata_qdi.c
@@ -102,14 +102,14 @@ static void qdi6580_set_piomode(struct ata_port *ap, struct ata_device *adev)
 }
 
 /**
- *      qdi_qc_issue_prot       -       command issue
+ *      qdi_qc_issue            -       command issue
  *      @qc: command pending
  *
  *      Called when the libata layer is about to issue a command. We wrap
  *      this interface so that we can load the correct ATA timings.
  */
 
-static unsigned int qdi_qc_issue_prot(struct ata_queued_cmd *qc)
+static unsigned int qdi_qc_issue(struct ata_queued_cmd *qc)
 {
         struct ata_port *ap = qc->ap;
         struct ata_device *adev = qc->dev;
@@ -121,7 +121,7 @@ static unsigned int qdi_qc_issue_prot(struct ata_queued_cmd *qc)
                         outb(qdi->clock[adev->devno], qdi->timing);
                 }
         }
-        return ata_qc_issue_prot(qc);
+        return ata_sff_qc_issue(qc);
 }
 
 static unsigned int qdi_data_xfer(struct ata_device *dev, unsigned char *buf,
@@ -148,7 +148,7 @@ static unsigned int qdi_data_xfer(struct ata_device *dev, unsigned char *buf,
                         buflen += 4 - slop;
                 }
         } else
-                buflen = ata_data_xfer(dev, buf, buflen, rw);
+                buflen = ata_sff_data_xfer(dev, buf, buflen, rw);
 
         return buflen;
 }
@@ -159,7 +159,7 @@ static struct scsi_host_template qdi_sht = {
 
 static struct ata_port_operations qdi6500_port_ops = {
         .inherits       = &ata_sff_port_ops,
-        .qc_issue       = qdi_qc_issue_prot,
+        .qc_issue       = qdi_qc_issue,
         .data_xfer      = qdi_data_xfer,
         .cable_detect   = ata_cable_40wire,
         .set_piomode    = qdi6500_set_piomode,
@@ -223,7 +223,7 @@ static __init int qdi_init_one(unsigned long port, int type, unsigned long io, i
         ap->ioaddr.cmd_addr = io_addr;
         ap->ioaddr.altstatus_addr = ctl_addr;
         ap->ioaddr.ctl_addr = ctl_addr;
-        ata_std_ports(&ap->ioaddr);
+        ata_sff_std_ports(&ap->ioaddr);
 
         ata_port_desc(ap, "cmd %lx ctl %lx", io, ctl);
 
@@ -239,7 +239,7 @@ static __init int qdi_init_one(unsigned long port, int type, unsigned long io, i
         printk(KERN_INFO DRV_NAME": qd%d at 0x%lx.\n", type, io);
 
         /* activate */
-        ret = ata_host_activate(host, irq, ata_interrupt, 0, &qdi_sht);
+        ret = ata_host_activate(host, irq, ata_sff_interrupt, 0, &qdi_sht);
         if (ret)
                 goto fail;