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/pata_amd.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/pata_amd.c')
-rw-r--r-- | drivers/ata/pata_amd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c index 33074c34105c..26665c396485 100644 --- a/drivers/ata/pata_amd.c +++ b/drivers/ata/pata_amd.c | |||
@@ -143,7 +143,7 @@ static int amd_pre_reset(struct ata_link *link, unsigned long deadline) | |||
143 | if (!pci_test_config_bits(pdev, &amd_enable_bits[ap->port_no])) | 143 | if (!pci_test_config_bits(pdev, &amd_enable_bits[ap->port_no])) |
144 | return -ENOENT; | 144 | return -ENOENT; |
145 | 145 | ||
146 | return ata_std_prereset(link, deadline); | 146 | return ata_sff_prereset(link, deadline); |
147 | } | 147 | } |
148 | 148 | ||
149 | static int amd_cable_detect(struct ata_port *ap) | 149 | static int amd_cable_detect(struct ata_port *ap) |
@@ -293,7 +293,7 @@ static int nv_pre_reset(struct ata_link *link, unsigned long deadline) | |||
293 | if (!pci_test_config_bits(pdev, &nv_enable_bits[ap->port_no])) | 293 | if (!pci_test_config_bits(pdev, &nv_enable_bits[ap->port_no])) |
294 | return -ENOENT; | 294 | return -ENOENT; |
295 | 295 | ||
296 | return ata_std_prereset(link, deadline); | 296 | return ata_sff_prereset(link, deadline); |
297 | } | 297 | } |
298 | 298 | ||
299 | /** | 299 | /** |
@@ -503,7 +503,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
503 | ppi[0] = &info[type]; | 503 | ppi[0] = &info[type]; |
504 | 504 | ||
505 | if (type < 3) | 505 | if (type < 3) |
506 | ata_pci_clear_simplex(pdev); | 506 | ata_pci_bmdma_clear_simplex(pdev); |
507 | 507 | ||
508 | /* Check for AMD7411 */ | 508 | /* Check for AMD7411 */ |
509 | if (type == 3) | 509 | if (type == 3) |
@@ -523,7 +523,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
523 | } | 523 | } |
524 | 524 | ||
525 | /* And fire it up */ | 525 | /* And fire it up */ |
526 | return ata_pci_init_one(pdev, ppi, &amd_sht, hpriv); | 526 | return ata_pci_sff_init_one(pdev, ppi, &amd_sht, hpriv); |
527 | } | 527 | } |
528 | 528 | ||
529 | #ifdef CONFIG_PM | 529 | #ifdef CONFIG_PM |
@@ -546,7 +546,7 @@ static int amd_reinit_one(struct pci_dev *pdev) | |||
546 | pci_write_config_byte(pdev, 0x41, fifo | 0xF0); | 546 | pci_write_config_byte(pdev, 0x41, fifo | 0xF0); |
547 | if (pdev->device == PCI_DEVICE_ID_AMD_VIPER_7409 || | 547 | if (pdev->device == PCI_DEVICE_ID_AMD_VIPER_7409 || |
548 | pdev->device == PCI_DEVICE_ID_AMD_COBRA_7401) | 548 | pdev->device == PCI_DEVICE_ID_AMD_COBRA_7401) |
549 | ata_pci_clear_simplex(pdev); | 549 | ata_pci_bmdma_clear_simplex(pdev); |
550 | } | 550 | } |
551 | 551 | ||
552 | ata_host_resume(host); | 552 | ata_host_resume(host); |