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_it821x.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_it821x.c')
-rw-r--r-- | drivers/ata/pata_it821x.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c index 6a8a4ddf5bfe..88e37cfcfc4f 100644 --- a/drivers/ata/pata_it821x.c +++ b/drivers/ata/pata_it821x.c | |||
@@ -395,11 +395,11 @@ static void it821x_passthru_dev_select(struct ata_port *ap, | |||
395 | it821x_program(ap, adev, itdev->pio[adev->devno]); | 395 | it821x_program(ap, adev, itdev->pio[adev->devno]); |
396 | itdev->last_device = device; | 396 | itdev->last_device = device; |
397 | } | 397 | } |
398 | ata_std_dev_select(ap, device); | 398 | ata_sff_dev_select(ap, device); |
399 | } | 399 | } |
400 | 400 | ||
401 | /** | 401 | /** |
402 | * it821x_smart_qc_issue_prot - wrap qc issue prot | 402 | * it821x_smart_qc_issue - wrap qc issue prot |
403 | * @qc: command | 403 | * @qc: command |
404 | * | 404 | * |
405 | * Wrap the command issue sequence for the IT821x. We need to | 405 | * Wrap the command issue sequence for the IT821x. We need to |
@@ -407,7 +407,7 @@ static void it821x_passthru_dev_select(struct ata_port *ap, | |||
407 | * usual happenings kick off | 407 | * usual happenings kick off |
408 | */ | 408 | */ |
409 | 409 | ||
410 | static unsigned int it821x_smart_qc_issue_prot(struct ata_queued_cmd *qc) | 410 | static unsigned int it821x_smart_qc_issue(struct ata_queued_cmd *qc) |
411 | { | 411 | { |
412 | switch(qc->tf.command) | 412 | switch(qc->tf.command) |
413 | { | 413 | { |
@@ -427,14 +427,14 @@ static unsigned int it821x_smart_qc_issue_prot(struct ata_queued_cmd *qc) | |||
427 | case ATA_CMD_ID_ATA: | 427 | case ATA_CMD_ID_ATA: |
428 | /* Arguably should just no-op this one */ | 428 | /* Arguably should just no-op this one */ |
429 | case ATA_CMD_SET_FEATURES: | 429 | case ATA_CMD_SET_FEATURES: |
430 | return ata_qc_issue_prot(qc); | 430 | return ata_sff_qc_issue(qc); |
431 | } | 431 | } |
432 | printk(KERN_DEBUG "it821x: can't process command 0x%02X\n", qc->tf.command); | 432 | printk(KERN_DEBUG "it821x: can't process command 0x%02X\n", qc->tf.command); |
433 | return AC_ERR_DEV; | 433 | return AC_ERR_DEV; |
434 | } | 434 | } |
435 | 435 | ||
436 | /** | 436 | /** |
437 | * it821x_passthru_qc_issue_prot - wrap qc issue prot | 437 | * it821x_passthru_qc_issue - wrap qc issue prot |
438 | * @qc: command | 438 | * @qc: command |
439 | * | 439 | * |
440 | * Wrap the command issue sequence for the IT821x. We need to | 440 | * Wrap the command issue sequence for the IT821x. We need to |
@@ -442,10 +442,10 @@ static unsigned int it821x_smart_qc_issue_prot(struct ata_queued_cmd *qc) | |||
442 | * usual happenings kick off | 442 | * usual happenings kick off |
443 | */ | 443 | */ |
444 | 444 | ||
445 | static unsigned int it821x_passthru_qc_issue_prot(struct ata_queued_cmd *qc) | 445 | static unsigned int it821x_passthru_qc_issue(struct ata_queued_cmd *qc) |
446 | { | 446 | { |
447 | it821x_passthru_dev_select(qc->ap, qc->dev->devno); | 447 | it821x_passthru_dev_select(qc->ap, qc->dev->devno); |
448 | return ata_qc_issue_prot(qc); | 448 | return ata_sff_qc_issue(qc); |
449 | } | 449 | } |
450 | 450 | ||
451 | /** | 451 | /** |
@@ -639,7 +639,7 @@ static struct ata_port_operations it821x_smart_port_ops = { | |||
639 | .inherits = &ata_bmdma_port_ops, | 639 | .inherits = &ata_bmdma_port_ops, |
640 | 640 | ||
641 | .check_atapi_dma= it821x_check_atapi_dma, | 641 | .check_atapi_dma= it821x_check_atapi_dma, |
642 | .qc_issue = it821x_smart_qc_issue_prot, | 642 | .qc_issue = it821x_smart_qc_issue, |
643 | 643 | ||
644 | .cable_detect = it821x_ident_hack, | 644 | .cable_detect = it821x_ident_hack, |
645 | .set_mode = it821x_smart_set_mode, | 645 | .set_mode = it821x_smart_set_mode, |
@@ -655,7 +655,7 @@ static struct ata_port_operations it821x_passthru_port_ops = { | |||
655 | .dev_select = it821x_passthru_dev_select, | 655 | .dev_select = it821x_passthru_dev_select, |
656 | .bmdma_start = it821x_passthru_bmdma_start, | 656 | .bmdma_start = it821x_passthru_bmdma_start, |
657 | .bmdma_stop = it821x_passthru_bmdma_stop, | 657 | .bmdma_stop = it821x_passthru_bmdma_stop, |
658 | .qc_issue = it821x_passthru_qc_issue_prot, | 658 | .qc_issue = it821x_passthru_qc_issue, |
659 | 659 | ||
660 | .cable_detect = ata_cable_unknown, | 660 | .cable_detect = ata_cable_unknown, |
661 | .set_piomode = it821x_passthru_set_piomode, | 661 | .set_piomode = it821x_passthru_set_piomode, |
@@ -722,7 +722,7 @@ static int it821x_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
722 | else | 722 | else |
723 | ppi[0] = &info_smart; | 723 | ppi[0] = &info_smart; |
724 | 724 | ||
725 | return ata_pci_init_one(pdev, ppi, &it821x_sht, NULL); | 725 | return ata_pci_sff_init_one(pdev, ppi, &it821x_sht, NULL); |
726 | } | 726 | } |
727 | 727 | ||
728 | #ifdef CONFIG_PM | 728 | #ifdef CONFIG_PM |