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_mv.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_mv.c')
-rw-r--r-- | drivers/ata/sata_mv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c index 16c15ed3536e..fa75df634c75 100644 --- a/drivers/ata/sata_mv.c +++ b/drivers/ata/sata_mv.c | |||
@@ -1386,7 +1386,7 @@ static unsigned int mv_qc_issue(struct ata_queued_cmd *qc) | |||
1386 | * shadow block, etc registers. | 1386 | * shadow block, etc registers. |
1387 | */ | 1387 | */ |
1388 | mv_stop_edma(ap); | 1388 | mv_stop_edma(ap); |
1389 | return ata_qc_issue_prot(qc); | 1389 | return ata_sff_qc_issue(qc); |
1390 | } | 1390 | } |
1391 | 1391 | ||
1392 | mv_start_dma(ap, port_mmio, pp, qc->tf.protocol); | 1392 | mv_start_dma(ap, port_mmio, pp, qc->tf.protocol); |
@@ -2362,7 +2362,7 @@ comreset_retry: | |||
2362 | */ | 2362 | */ |
2363 | retry = 20; | 2363 | retry = 20; |
2364 | while (1) { | 2364 | while (1) { |
2365 | u8 drv_stat = ata_check_status(ap); | 2365 | u8 drv_stat = ata_sff_check_status(ap); |
2366 | if ((drv_stat != 0x80) && (drv_stat != 0x7f)) | 2366 | if ((drv_stat != 0x80) && (drv_stat != 0x7f)) |
2367 | break; | 2367 | break; |
2368 | msleep(500); | 2368 | msleep(500); |
@@ -2377,7 +2377,7 @@ comreset_retry: | |||
2377 | */ | 2377 | */ |
2378 | 2378 | ||
2379 | /* finally, read device signature from TF registers */ | 2379 | /* finally, read device signature from TF registers */ |
2380 | *class = ata_dev_try_classify(ap->link.device, 1, NULL); | 2380 | *class = ata_sff_dev_classify(ap->link.device, 1, NULL); |
2381 | 2381 | ||
2382 | writelfl(0, port_mmio + EDMA_ERR_IRQ_CAUSE_OFS); | 2382 | writelfl(0, port_mmio + EDMA_ERR_IRQ_CAUSE_OFS); |
2383 | 2383 | ||