Skip to content

Commit

Permalink
libata: rename SFF port ops
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
htejun authored and Jeff Garzik committed Apr 17, 2008
1 parent 9363c38 commit 5682ed3
Show file tree
Hide file tree
Showing 33 changed files with 192 additions and 188 deletions.
6 changes: 3 additions & 3 deletions drivers/ata/ahci.c
Original file line number Diff line number Diff line change
Expand Up @@ -292,10 +292,10 @@ static struct scsi_host_template ahci_sht = {
static struct ata_port_operations ahci_ops = {
.inherits = &sata_pmp_port_ops,

.check_status = ahci_check_status,
.check_altstatus = ahci_check_status,
.sff_check_status = ahci_check_status,
.sff_check_altstatus = ahci_check_status,

.tf_read = ahci_tf_read,
.sff_tf_read = ahci_tf_read,
.qc_defer = sata_pmp_qc_defer_cmd_switch,
.qc_prep = ahci_qc_prep,
.qc_issue = ahci_qc_issue,
Expand Down
18 changes: 9 additions & 9 deletions drivers/ata/libata-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ const unsigned long sata_deb_timing_hotplug[] = { 25, 500, 2000 };
const unsigned long sata_deb_timing_long[] = { 100, 2000, 5000 };

const struct ata_port_operations ata_base_port_ops = {
.irq_clear = ata_noop_irq_clear,
.sff_irq_clear = ata_noop_irq_clear,
.prereset = ata_sff_prereset,
.hardreset = sata_sff_hardreset,
.postreset = ata_sff_postreset,
Expand All @@ -85,7 +85,7 @@ const struct ata_port_operations sata_port_ops = {
.inherits = &ata_base_port_ops,

.qc_defer = ata_std_qc_defer,
.dev_select = ata_noop_dev_select,
.sff_dev_select = ata_noop_dev_select,
};

const struct ata_port_operations sata_pmp_port_ops = {
Expand Down Expand Up @@ -3563,9 +3563,9 @@ void ata_sff_postreset(struct ata_link *link, unsigned int *classes)

/* is double-select really necessary? */
if (classes[0] != ATA_DEV_NONE)
ap->ops->dev_select(ap, 1);
ap->ops->sff_dev_select(ap, 1);
if (classes[1] != ATA_DEV_NONE)
ap->ops->dev_select(ap, 0);
ap->ops->sff_dev_select(ap, 0);

/* bail out if no device is present */
if (classes[0] == ATA_DEV_NONE && classes[1] == ATA_DEV_NONE) {
Expand Down Expand Up @@ -4416,7 +4416,7 @@ static void fill_result_tf(struct ata_queued_cmd *qc)
struct ata_port *ap = qc->ap;

qc->result_tf.flags = qc->tf.flags;
ap->ops->tf_read(ap, &qc->result_tf);
ap->ops->sff_tf_read(ap, &qc->result_tf);
}

static void ata_verify_xfer(struct ata_queued_cmd *qc)
Expand Down Expand Up @@ -6049,16 +6049,16 @@ static unsigned int ata_dummy_qc_issue(struct ata_queued_cmd *qc)
}

struct ata_port_operations ata_dummy_port_ops = {
.check_status = ata_dummy_check_status,
.check_altstatus = ata_dummy_check_status,
.dev_select = ata_noop_dev_select,
.sff_check_status = ata_dummy_check_status,
.sff_check_altstatus = ata_dummy_check_status,
.sff_dev_select = ata_noop_dev_select,
.qc_prep = ata_noop_qc_prep,
.qc_issue = ata_dummy_qc_issue,
.freeze = ata_dummy_noret,
.thaw = ata_dummy_noret,
.error_handler = ata_dummy_noret,
.post_internal_cmd = ata_dummy_qc_noret,
.irq_clear = ata_dummy_noret,
.sff_irq_clear = ata_dummy_noret,
.port_start = ata_dummy_ret0,
.port_stop = ata_dummy_noret,
};
Expand Down
2 changes: 1 addition & 1 deletion drivers/ata/libata-scsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -2393,7 +2393,7 @@ static void atapi_request_sense(struct ata_queued_cmd *qc)
/* FIXME: is this needed? */
memset(cmd->sense_buffer, 0, SCSI_SENSE_BUFFERSIZE);

ap->ops->tf_read(ap, &qc->tf);
ap->ops->sff_tf_read(ap, &qc->tf);

/* fill these in, for the case where they are -not- overwritten */
cmd->sense_buffer[0] = 0x70;
Expand Down
Loading

0 comments on commit 5682ed3

Please sign in to comment.