diff options
author | Tejun Heo <htejun@gmail.com> | 2008-04-07 09:47:16 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-04-17 15:44:21 -0400 |
commit | 9363c3825ea9ad76561eb48a395349dd29211ed6 (patch) | |
tree | abe89a0f7c82b805d84b1a211c97b317f6628d5f /drivers/ata/ata_piix.c | |
parent | b67a1064cb1c1d3b43e01e8b43a6a8dcdefed733 (diff) |
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>
Diffstat (limited to 'drivers/ata/ata_piix.c')
-rw-r--r-- | drivers/ata/ata_piix.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c index e113f2f80275..7ab76a413cdf 100644 --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c | |||
@@ -629,7 +629,7 @@ static int piix_pata_prereset(struct ata_link *link, unsigned long deadline) | |||
629 | 629 | ||
630 | if (!pci_test_config_bits(pdev, &piix_enable_bits[ap->port_no])) | 630 | if (!pci_test_config_bits(pdev, &piix_enable_bits[ap->port_no])) |
631 | return -ENOENT; | 631 | return -ENOENT; |
632 | return ata_std_prereset(link, deadline); | 632 | return ata_sff_prereset(link, deadline); |
633 | } | 633 | } |
634 | 634 | ||
635 | /** | 635 | /** |
@@ -1493,7 +1493,7 @@ static int __devinit piix_init_one(struct pci_dev *pdev, | |||
1493 | hpriv->map = piix_init_sata_map(pdev, port_info, | 1493 | hpriv->map = piix_init_sata_map(pdev, port_info, |
1494 | piix_map_db_table[ent->driver_data]); | 1494 | piix_map_db_table[ent->driver_data]); |
1495 | 1495 | ||
1496 | rc = ata_pci_prepare_sff_host(pdev, ppi, &host); | 1496 | rc = ata_pci_sff_prepare_host(pdev, ppi, &host); |
1497 | if (rc) | 1497 | if (rc) |
1498 | return rc; | 1498 | return rc; |
1499 | host->private_data = hpriv; | 1499 | host->private_data = hpriv; |
@@ -1527,7 +1527,7 @@ static int __devinit piix_init_one(struct pci_dev *pdev, | |||
1527 | } | 1527 | } |
1528 | 1528 | ||
1529 | pci_set_master(pdev); | 1529 | pci_set_master(pdev); |
1530 | return ata_pci_activate_sff_host(host, ata_interrupt, &piix_sht); | 1530 | return ata_pci_sff_activate_host(host, ata_sff_interrupt, &piix_sht); |
1531 | } | 1531 | } |
1532 | 1532 | ||
1533 | static int __init piix_init(void) | 1533 | static int __init piix_init(void) |