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, 6 insertions, 6 deletions

diff --git a/drivers/ata/pata_serverworks.c b/drivers/ata/pata_serverworks.c
index 2f4f9b0f89de..ffd26d0dc50d 100644
--- a/drivers/ata/pata_serverworks.c
+++ b/drivers/ata/pata_serverworks.c
@@ -199,7 +199,7 @@ static unsigned long serverworks_osb4_filter(struct ata_device *adev, unsigned l
 {
         if (adev->class == ATA_DEV_ATA)
                 mask &= ~ATA_MASK_UDMA;
-        return ata_pci_default_filter(adev, mask);
+        return ata_bmdma_mode_filter(adev, mask);
 }
 
 
@@ -219,7 +219,7 @@ static unsigned long serverworks_csb_filter(struct ata_device *adev, unsigned lo
 
         /* Disk, UDMA */
         if (adev->class != ATA_DEV_ATA)
-                return ata_pci_default_filter(adev, mask);
+                return ata_bmdma_mode_filter(adev, mask);
 
         /* Actually do need to check */
         ata_id_c_string(adev->id, model_num, ATA_ID_PROD, sizeof(model_num));
@@ -228,7 +228,7 @@ static unsigned long serverworks_csb_filter(struct ata_device *adev, unsigned lo
                 if (!strcmp(p, model_num))
                         mask &= ~(0xE0 << ATA_SHIFT_UDMA);
         }
-        return ata_pci_default_filter(adev, mask);
+        return ata_bmdma_mode_filter(adev, mask);
 }
 
 /**
@@ -459,9 +459,9 @@ static int serverworks_init_one(struct pci_dev *pdev, const struct pci_device_id
                 serverworks_fixup_ht1000(pdev);
 
         if (pdev->device == PCI_DEVICE_ID_SERVERWORKS_CSB5IDE)
-                ata_pci_clear_simplex(pdev);
+                ata_pci_bmdma_clear_simplex(pdev);
 
-        return ata_pci_init_one(pdev, ppi, &serverworks_sht, NULL);
+        return ata_pci_sff_init_one(pdev, ppi, &serverworks_sht, NULL);
 }
 
 #ifdef CONFIG_PM
@@ -482,7 +482,7 @@ static int serverworks_reinit_one(struct pci_dev *pdev)
                         serverworks_fixup_osb4(pdev);
                         break;
                 case PCI_DEVICE_ID_SERVERWORKS_CSB5IDE:
-                        ata_pci_clear_simplex(pdev);
+                        ata_pci_bmdma_clear_simplex(pdev);
                         /* fall through */
                 case PCI_DEVICE_ID_SERVERWORKS_CSB6IDE:
                 case PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2: