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/sata_sis.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/sata_sis.c')
-rw-r--r-- | drivers/ata/sata_sis.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c index 9089c7ab5000..6b8e45ba32e8 100644 --- a/drivers/ata/sata_sis.c +++ b/drivers/ata/sata_sis.c | |||
@@ -309,7 +309,7 @@ static int sis_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
309 | break; | 309 | break; |
310 | } | 310 | } |
311 | 311 | ||
312 | rc = ata_pci_prepare_sff_host(pdev, ppi, &host); | 312 | rc = ata_pci_sff_prepare_host(pdev, ppi, &host); |
313 | if (rc) | 313 | if (rc) |
314 | return rc; | 314 | return rc; |
315 | 315 | ||
@@ -327,8 +327,8 @@ static int sis_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
327 | 327 | ||
328 | pci_set_master(pdev); | 328 | pci_set_master(pdev); |
329 | pci_intx(pdev, 1); | 329 | pci_intx(pdev, 1); |
330 | return ata_host_activate(host, pdev->irq, ata_interrupt, IRQF_SHARED, | 330 | return ata_host_activate(host, pdev->irq, ata_sff_interrupt, |
331 | &sis_sht); | 331 | IRQF_SHARED, &sis_sht); |
332 | } | 332 | } |
333 | 333 | ||
334 | static int __init sis_init(void) | 334 | static int __init sis_init(void) |