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/libata-core.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/libata-core.c')
-rw-r--r-- | drivers/ata/libata-core.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index fa205d7c5bea..cbdbfb5eaeaa 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c | |||
@@ -75,9 +75,9 @@ const unsigned long sata_deb_timing_long[] = { 100, 2000, 5000 }; | |||
75 | 75 | ||
76 | const struct ata_port_operations ata_base_port_ops = { | 76 | const struct ata_port_operations ata_base_port_ops = { |
77 | .irq_clear = ata_noop_irq_clear, | 77 | .irq_clear = ata_noop_irq_clear, |
78 | .prereset = ata_std_prereset, | 78 | .prereset = ata_sff_prereset, |
79 | .hardreset = sata_std_hardreset, | 79 | .hardreset = sata_sff_hardreset, |
80 | .postreset = ata_std_postreset, | 80 | .postreset = ata_sff_postreset, |
81 | .error_handler = ata_std_error_handler, | 81 | .error_handler = ata_std_error_handler, |
82 | }; | 82 | }; |
83 | 83 | ||
@@ -3425,7 +3425,7 @@ int sata_link_resume(struct ata_link *link, const unsigned long *params, | |||
3425 | } | 3425 | } |
3426 | 3426 | ||
3427 | /** | 3427 | /** |
3428 | * ata_std_prereset - prepare for reset | 3428 | * ata_sff_prereset - prepare for reset |
3429 | * @link: ATA link to be reset | 3429 | * @link: ATA link to be reset |
3430 | * @deadline: deadline jiffies for the operation | 3430 | * @deadline: deadline jiffies for the operation |
3431 | * | 3431 | * |
@@ -3441,7 +3441,7 @@ int sata_link_resume(struct ata_link *link, const unsigned long *params, | |||
3441 | * RETURNS: | 3441 | * RETURNS: |
3442 | * 0 on success, -errno otherwise. | 3442 | * 0 on success, -errno otherwise. |
3443 | */ | 3443 | */ |
3444 | int ata_std_prereset(struct ata_link *link, unsigned long deadline) | 3444 | int ata_sff_prereset(struct ata_link *link, unsigned long deadline) |
3445 | { | 3445 | { |
3446 | struct ata_port *ap = link->ap; | 3446 | struct ata_port *ap = link->ap; |
3447 | struct ata_eh_context *ehc = &link->eh_context; | 3447 | struct ata_eh_context *ehc = &link->eh_context; |
@@ -3463,7 +3463,7 @@ int ata_std_prereset(struct ata_link *link, unsigned long deadline) | |||
3463 | 3463 | ||
3464 | /* wait for !BSY if we don't know that no device is attached */ | 3464 | /* wait for !BSY if we don't know that no device is attached */ |
3465 | if (!ata_link_offline(link)) { | 3465 | if (!ata_link_offline(link)) { |
3466 | rc = ata_wait_ready(ap, deadline); | 3466 | rc = ata_sff_wait_ready(ap, deadline); |
3467 | if (rc && rc != -ENODEV) { | 3467 | if (rc && rc != -ENODEV) { |
3468 | ata_link_printk(link, KERN_WARNING, "device not ready " | 3468 | ata_link_printk(link, KERN_WARNING, "device not ready " |
3469 | "(errno=%d), forcing hardreset\n", rc); | 3469 | "(errno=%d), forcing hardreset\n", rc); |
@@ -3535,7 +3535,7 @@ int sata_link_hardreset(struct ata_link *link, const unsigned long *timing, | |||
3535 | } | 3535 | } |
3536 | 3536 | ||
3537 | /** | 3537 | /** |
3538 | * ata_std_postreset - standard postreset callback | 3538 | * ata_sff_postreset - standard postreset callback |
3539 | * @link: the target ata_link | 3539 | * @link: the target ata_link |
3540 | * @classes: classes of attached devices | 3540 | * @classes: classes of attached devices |
3541 | * | 3541 | * |
@@ -3546,7 +3546,7 @@ int sata_link_hardreset(struct ata_link *link, const unsigned long *timing, | |||
3546 | * LOCKING: | 3546 | * LOCKING: |
3547 | * Kernel thread context (may sleep) | 3547 | * Kernel thread context (may sleep) |
3548 | */ | 3548 | */ |
3549 | void ata_std_postreset(struct ata_link *link, unsigned int *classes) | 3549 | void ata_sff_postreset(struct ata_link *link, unsigned int *classes) |
3550 | { | 3550 | { |
3551 | struct ata_port *ap = link->ap; | 3551 | struct ata_port *ap = link->ap; |
3552 | u32 serror; | 3552 | u32 serror; |