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

diff --git a/drivers/ata/pata_bf54x.c b/drivers/ata/pata_bf54x.c
index 457ac800cd5e..c854e882d4a9 100644
--- a/drivers/ata/pata_bf54x.c
+++ b/drivers/ata/pata_bf54x.c
@@ -674,7 +674,7 @@ static void read_atapi_data(void __iomem *base,
  *      @ap: Port to which output is sent
  *      @tf: ATA taskfile register set
  *
- *      Note: Original code is ata_tf_load().
+ *      Note: Original code is ata_sff_tf_load().
  */
 
 static void bfin_tf_load(struct ata_port *ap, const struct ata_taskfile *tf)
@@ -745,7 +745,7 @@ static u8 bfin_check_status(struct ata_port *ap)
  *      @ap: Port from which input is read
  *      @tf: ATA taskfile register set for storing input
  *
- *      Note: Original code is ata_tf_read().
+ *      Note: Original code is ata_sff_tf_read().
  */
 
 static void bfin_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
@@ -775,7 +775,7 @@ static void bfin_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
  *      @ap: port to which command is being issued
  *      @tf: ATA taskfile register set
  *
- *      Note: Original code is ata_exec_command().
+ *      Note: Original code is ata_sff_exec_command().
  */
 
 static void bfin_exec_command(struct ata_port *ap,
@@ -785,7 +785,7 @@ static void bfin_exec_command(struct ata_port *ap,
         dev_dbg(ap->dev, "ata%u: cmd 0x%X\n", ap->print_id, tf->command);
 
         write_atapi_register(base, ATA_REG_CMD, tf->command);
-        ata_pause(ap);
+        ata_sff_pause(ap);
 }
 
 /**
@@ -800,14 +800,14 @@ static u8 bfin_check_altstatus(struct ata_port *ap)
 }
 
 /**
- *      bfin_std_dev_select - Select device 0/1 on ATA bus
+ *      bfin_dev_select - Select device 0/1 on ATA bus
  *      @ap: ATA channel to manipulate
  *      @device: ATA device (numbered from zero) to select
  *
- *      Note: Original code is ata_std_dev_select().
+ *      Note: Original code is ata_sff_dev_select().
  */
 
-static void bfin_std_dev_select(struct ata_port *ap, unsigned int device)
+static void bfin_dev_select(struct ata_port *ap, unsigned int device)
 {
         void __iomem *base = (void __iomem *)ap->ioaddr.ctl_addr;
         u8 tmp;
@@ -818,7 +818,7 @@ static void bfin_std_dev_select(struct ata_port *ap, unsigned int device)
                 tmp = ATA_DEVICE_OBS | ATA_DEV1;
 
         write_atapi_register(base, ATA_REG_DEVICE, tmp);
-        ata_pause(ap);
+        ata_sff_pause(ap);
 }
 
 /**
@@ -977,7 +977,7 @@ static unsigned int bfin_devchk(struct ata_port *ap,
         void __iomem *base = (void __iomem *)ap->ioaddr.ctl_addr;
         u8 nsect, lbal;
 
-        bfin_std_dev_select(ap, device);
+        bfin_dev_select(ap, device);
 
         write_atapi_register(base, ATA_REG_NSECT, 0x55);
         write_atapi_register(base, ATA_REG_LBAL, 0xaa);
@@ -1014,7 +1014,7 @@ static void bfin_bus_post_reset(struct ata_port *ap, unsigned int devmask)
          * BSY bit to clear
          */
         if (dev0)
-                ata_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT);
+                ata_sff_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT);
 
         /* if device 1 was found in ata_devchk, wait for
          * register access, then wait for BSY to clear
@@ -1023,7 +1023,7 @@ static void bfin_bus_post_reset(struct ata_port *ap, unsigned int devmask)
         while (dev1) {
                 u8 nsect, lbal;
 
-                bfin_std_dev_select(ap, 1);
+                bfin_dev_select(ap, 1);
                 nsect = read_atapi_register(base, ATA_REG_NSECT);
                 lbal = read_atapi_register(base, ATA_REG_LBAL);
                 if ((nsect == 1) && (lbal == 1))
@@ -1035,14 +1035,14 @@ static void bfin_bus_post_reset(struct ata_port *ap, unsigned int devmask)
                 msleep(50);     /* give drive a breather */
         }
         if (dev1)
-                ata_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT);
+                ata_sff_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT);
 
         /* is all this really necessary? */
-        bfin_std_dev_select(ap, 0);
+        bfin_dev_select(ap, 0);
         if (dev1)
-                bfin_std_dev_select(ap, 1);
+                bfin_dev_select(ap, 1);
         if (dev0)
-                bfin_std_dev_select(ap, 0);
+                bfin_dev_select(ap, 0);
 }
 
 /**
@@ -1088,15 +1088,15 @@ static unsigned int bfin_bus_softreset(struct ata_port *ap,
 }
 
 /**
- *      bfin_std_softreset - reset host port via ATA SRST
+ *      bfin_softreset - reset host port via ATA SRST
  *      @ap: port to reset
  *      @classes: resulting classes of attached devices
  *
- *      Note: Original code is ata_std_softreset().
+ *      Note: Original code is ata_sff_softreset().
  */
 
-static int bfin_std_softreset(struct ata_link *link, unsigned int *classes,
-                unsigned long deadline)
+static int bfin_softreset(struct ata_link *link, unsigned int *classes,
+                          unsigned long deadline)
 {
         struct ata_port *ap = link->ap;
         unsigned int slave_possible = ap->flags & ATA_FLAG_SLAVE_POSS;
@@ -1115,7 +1115,7 @@ static int bfin_std_softreset(struct ata_link *link, unsigned int *classes,
                 devmask |= (1 << 1);
 
         /* select device 0 again */
-        bfin_std_dev_select(ap, 0);
+        bfin_dev_select(ap, 0);
 
         /* issue bus reset */
         err_mask = bfin_bus_softreset(ap, devmask);
@@ -1126,10 +1126,10 @@ static int bfin_std_softreset(struct ata_link *link, unsigned int *classes,
         }
 
         /* determine by signature whether we have ATA or ATAPI devices */
-        classes[0] = ata_dev_try_classify(&ap->link.device[0],
+        classes[0] = ata_sff_dev_classify(&ap->link.device[0],
                                 devmask & (1 << 0), &err);
         if (slave_possible && err != 0x81)
-                classes[1] = ata_dev_try_classify(&ap->link.device[1],
+                classes[1] = ata_sff_dev_classify(&ap->link.device[1],
                                         devmask & (1 << 1), &err);
 
  out:
@@ -1167,7 +1167,7 @@ static unsigned char bfin_bmdma_status(struct ata_port *ap)
  *      @buflen: buffer length
  *      @write_data: read/write
  *
- *      Note: Original code is ata_data_xfer().
+ *      Note: Original code is ata_sff_data_xfer().
  */
 
 static unsigned int bfin_data_xfer(struct ata_device *dev, unsigned char *buf,
@@ -1206,7 +1206,7 @@ static unsigned int bfin_data_xfer(struct ata_device *dev, unsigned char *buf,
  *      bfin_irq_clear - Clear ATAPI interrupt.
  *      @ap: Port associated with this ATA transaction.
  *
- *      Note: Original code is ata_bmdma_irq_clear().
+ *      Note: Original code is ata_sff_irq_clear().
  */
 
 static void bfin_irq_clear(struct ata_port *ap)
@@ -1223,7 +1223,7 @@ static void bfin_irq_clear(struct ata_port *ap)
  *      bfin_irq_on - Enable interrupts on a port.
  *      @ap: Port on which interrupts are enabled.
  *
- *      Note: Original code is ata_irq_on().
+ *      Note: Original code is ata_sff_irq_on().
  */
 
 static unsigned char bfin_irq_on(struct ata_port *ap)
@@ -1244,13 +1244,13 @@ static unsigned char bfin_irq_on(struct ata_port *ap)
 }
 
 /**
- *      bfin_bmdma_freeze - Freeze DMA controller port
+ *      bfin_freeze - Freeze DMA controller port
  *      @ap: port to freeze
  *
- *      Note: Original code is ata_bmdma_freeze().
+ *      Note: Original code is ata_sff_freeze().
  */
 
-static void bfin_bmdma_freeze(struct ata_port *ap)
+static void bfin_freeze(struct ata_port *ap)
 {
         void __iomem *base = (void __iomem *)ap->ioaddr.ctl_addr;
 
@@ -1270,13 +1270,13 @@ static void bfin_bmdma_freeze(struct ata_port *ap)
 }
 
 /**
- *      bfin_bmdma_thaw - Thaw DMA controller port
+ *      bfin_thaw - Thaw DMA controller port
  *      @ap: port to thaw
  *
- *      Note: Original code is ata_bmdma_thaw().
+ *      Note: Original code is ata_sff_thaw().
  */
 
-void bfin_bmdma_thaw(struct ata_port *ap)
+void bfin_thaw(struct ata_port *ap)
 {
         bfin_check_status(ap);
         bfin_irq_clear(ap);
@@ -1284,14 +1284,14 @@ void bfin_bmdma_thaw(struct ata_port *ap)
 }
 
 /**
- *      bfin_std_postreset - standard postreset callback
+ *      bfin_postreset - standard postreset callback
  *      @ap: the target ata_port
  *      @classes: classes of attached devices
  *
- *      Note: Original code is ata_std_postreset().
+ *      Note: Original code is ata_sff_postreset().
  */
 
-static void bfin_std_postreset(struct ata_link *link, unsigned int *classes)
+static void bfin_postreset(struct ata_link *link, unsigned int *classes)
 {
         struct ata_port *ap = link->ap;
         void __iomem *base = (void __iomem *)ap->ioaddr.ctl_addr;
@@ -1301,9 +1301,9 @@ static void bfin_std_postreset(struct ata_link *link, unsigned int *classes)
 
         /* is double-select really necessary? */
         if (classes[0] != ATA_DEV_NONE)
-                bfin_std_dev_select(ap, 1);
+                bfin_dev_select(ap, 1);
         if (classes[1] != ATA_DEV_NONE)
-                bfin_std_dev_select(ap, 0);
+                bfin_dev_select(ap, 0);
 
         /* bail out if no device is present */
         if (classes[0] == ATA_DEV_NONE && classes[1] == ATA_DEV_NONE) {
@@ -1362,7 +1362,7 @@ static const struct ata_port_operations bfin_pata_ops = {
         .exec_command           = bfin_exec_command,
         .check_status           = bfin_check_status,
         .check_altstatus        = bfin_check_altstatus,
-        .dev_select             = bfin_std_dev_select,
+        .dev_select             = bfin_dev_select,
 
         .bmdma_setup            = bfin_bmdma_setup,
         .bmdma_start            = bfin_bmdma_start,
@@ -1372,10 +1372,10 @@ static const struct ata_port_operations bfin_pata_ops = {
 
         .qc_prep                = ata_noop_qc_prep,
 
-        .freeze                 = bfin_bmdma_freeze,
-        .thaw                   = bfin_bmdma_thaw,
-        .softreset              = bfin_std_softreset,
-        .postreset              = bfin_std_postreset,
+        .freeze                 = bfin_freeze,
+        .thaw                   = bfin_thaw,
+        .softreset              = bfin_softreset,
+        .postreset              = bfin_postreset,
         .post_internal_cmd      = bfin_bmdma_stop,
 
         .irq_clear              = bfin_irq_clear,
@@ -1513,7 +1513,7 @@ static int __devinit bfin_atapi_probe(struct platform_device *pdev)
         }
 
         if (ata_host_activate(host, platform_get_irq(pdev, 0),
-                ata_interrupt, IRQF_SHARED, &bfin_sht) != 0) {
+                ata_sff_interrupt, IRQF_SHARED, &bfin_sht) != 0) {
                 peripheral_free_list(atapi_io_port);
                 dev_err(&pdev->dev, "Fail to attach ATAPI device\n");
                 return -ENODEV;