aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/libata-core.c
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2008-04-07 09:47:16 -0400
committerJeff Garzik <jgarzik@redhat.com>2008-04-17 15:44:22 -0400
commit5682ed33aae05d10a25c95633ef9d9c062825888 (patch)
tree1632d4d70f4fd2dc25596a5cde1183f70f162ac3 /drivers/ata/libata-core.c
parent9363c3825ea9ad76561eb48a395349dd29211ed6 (diff)
libata: rename SFF port ops
Add sff_ prefix to SFF specific port ops. This rename is in preparation of separating SFF support out of libata core layer. This patch strictly renames ops 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.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index cbdbfb5eaeaa..a01e02c5ce7a 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -74,7 +74,7 @@ const unsigned long sata_deb_timing_hotplug[] = { 25, 500, 2000 };
74const unsigned long sata_deb_timing_long[] = { 100, 2000, 5000 }; 74const unsigned long sata_deb_timing_long[] = { 100, 2000, 5000 };
75 75
76const struct ata_port_operations ata_base_port_ops = { 76const struct ata_port_operations ata_base_port_ops = {
77 .irq_clear = ata_noop_irq_clear, 77 .sff_irq_clear = ata_noop_irq_clear,
78 .prereset = ata_sff_prereset, 78 .prereset = ata_sff_prereset,
79 .hardreset = sata_sff_hardreset, 79 .hardreset = sata_sff_hardreset,
80 .postreset = ata_sff_postreset, 80 .postreset = ata_sff_postreset,
@@ -85,7 +85,7 @@ const struct ata_port_operations sata_port_ops = {
85 .inherits = &ata_base_port_ops, 85 .inherits = &ata_base_port_ops,
86 86
87 .qc_defer = ata_std_qc_defer, 87 .qc_defer = ata_std_qc_defer,
88 .dev_select = ata_noop_dev_select, 88 .sff_dev_select = ata_noop_dev_select,
89}; 89};
90 90
91const struct ata_port_operations sata_pmp_port_ops = { 91const struct ata_port_operations sata_pmp_port_ops = {
@@ -3563,9 +3563,9 @@ void ata_sff_postreset(struct ata_link *link, unsigned int *classes)
3563 3563
3564 /* is double-select really necessary? */ 3564 /* is double-select really necessary? */
3565 if (classes[0] != ATA_DEV_NONE) 3565 if (classes[0] != ATA_DEV_NONE)
3566 ap->ops->dev_select(ap, 1); 3566 ap->ops->sff_dev_select(ap, 1);
3567 if (classes[1] != ATA_DEV_NONE) 3567 if (classes[1] != ATA_DEV_NONE)
3568 ap->ops->dev_select(ap, 0); 3568 ap->ops->sff_dev_select(ap, 0);
3569 3569
3570 /* bail out if no device is present */ 3570 /* bail out if no device is present */
3571 if (classes[0] == ATA_DEV_NONE && classes[1] == ATA_DEV_NONE) { 3571 if (classes[0] == ATA_DEV_NONE && classes[1] == ATA_DEV_NONE) {
@@ -4416,7 +4416,7 @@ static void fill_result_tf(struct ata_queued_cmd *qc)
4416 struct ata_port *ap = qc->ap; 4416 struct ata_port *ap = qc->ap;
4417 4417
4418 qc->result_tf.flags = qc->tf.flags; 4418 qc->result_tf.flags = qc->tf.flags;
4419 ap->ops->tf_read(ap, &qc->result_tf); 4419 ap->ops->sff_tf_read(ap, &qc->result_tf);
4420} 4420}
4421 4421
4422static void ata_verify_xfer(struct ata_queued_cmd *qc) 4422static void ata_verify_xfer(struct ata_queued_cmd *qc)
@@ -6049,16 +6049,16 @@ static unsigned int ata_dummy_qc_issue(struct ata_queued_cmd *qc)
6049} 6049}
6050 6050
6051struct ata_port_operations ata_dummy_port_ops = { 6051struct ata_port_operations ata_dummy_port_ops = {
6052 .check_status = ata_dummy_check_status, 6052 .sff_check_status = ata_dummy_check_status,
6053 .check_altstatus = ata_dummy_check_status, 6053 .sff_check_altstatus = ata_dummy_check_status,
6054 .dev_select = ata_noop_dev_select, 6054 .sff_dev_select = ata_noop_dev_select,
6055 .qc_prep = ata_noop_qc_prep, 6055 .qc_prep = ata_noop_qc_prep,
6056 .qc_issue = ata_dummy_qc_issue, 6056 .qc_issue = ata_dummy_qc_issue,
6057 .freeze = ata_dummy_noret, 6057 .freeze = ata_dummy_noret,
6058 .thaw = ata_dummy_noret, 6058 .thaw = ata_dummy_noret,
6059 .error_handler = ata_dummy_noret, 6059 .error_handler = ata_dummy_noret,
6060 .post_internal_cmd = ata_dummy_qc_noret, 6060 .post_internal_cmd = ata_dummy_qc_noret,
6061 .irq_clear = ata_dummy_noret, 6061 .sff_irq_clear = ata_dummy_noret,
6062 .port_start = ata_dummy_ret0, 6062 .port_start = ata_dummy_ret0,
6063 .port_stop = ata_dummy_noret, 6063 .port_stop = ata_dummy_noret,
6064}; 6064};