5 files changed, 25 insertions, 1 deletions

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 51876b93c1b7..3b822124e97e 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -74,6 +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 = {
+        .qc_fill_rtf            = ata_sff_qc_fill_rtf,
         .prereset               = ata_std_prereset,
         .postreset              = ata_std_postreset,
         .error_handler          = ata_std_error_handler,
@@ -4562,7 +4563,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->sff_tf_read(ap, &qc->result_tf);
+        ap->ops->qc_fill_rtf(qc);
 }
 
 static void ata_verify_xfer(struct ata_queued_cmd *qc)
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index 5be8a6058dac..5ae813f54420 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -1408,6 +1408,25 @@ unsigned int ata_sff_qc_issue(struct ata_queued_cmd *qc)
 }
 
 /**
+ *      ata_sff_qc_fill_rtf - fill result TF using ->sff_tf_read
+ *      @qc: qc to fill result TF for
+ *
+ *      @qc is finished and result TF needs to be filled.  Fill it
+ *      using ->sff_tf_read.
+ *
+ *      LOCKING:
+ *      spin_lock_irqsave(host lock)
+ *
+ *      RETURNS:
+ *      true indicating that result TF is successfully filled.
+ */
+bool ata_sff_qc_fill_rtf(struct ata_queued_cmd *qc)
+{
+        qc->ap->ops->sff_tf_read(qc->ap, &qc->result_tf);
+        return true;
+}
+
+/**
  *      ata_sff_host_intr - Handle host interrupt for given (port, task)
  *      @ap: Port on which interrupt arrived (possibly...)
  *      @qc: Taskfile currently active in engine
@@ -2724,6 +2743,7 @@ EXPORT_SYMBOL_GPL(ata_sff_irq_on);
 EXPORT_SYMBOL_GPL(ata_sff_irq_clear);
 EXPORT_SYMBOL_GPL(ata_sff_hsm_move);
 EXPORT_SYMBOL_GPL(ata_sff_qc_issue);
+EXPORT_SYMBOL_GPL(ata_sff_qc_fill_rtf);
 EXPORT_SYMBOL_GPL(ata_sff_host_intr);
 EXPORT_SYMBOL_GPL(ata_sff_interrupt);
 EXPORT_SYMBOL_GPL(ata_sff_freeze);
diff --git a/drivers/ata/sata_sx4.c b/drivers/ata/sata_sx4.c
index 6107eff731f3..ec04b8d3c791 100644
--- a/drivers/ata/sata_sx4.c
+++ b/drivers/ata/sata_sx4.c
@@ -251,6 +251,7 @@ static struct ata_port_operations pdc_20621_ops = {
         .phy_reset              = pdc_20621_phy_reset,
         .qc_prep                = pdc20621_qc_prep,
         .qc_issue               = pdc20621_qc_issue,
+        .qc_fill_rtf            = ata_sff_qc_fill_rtf,
         .sff_data_xfer          = ata_sff_data_xfer,
         .eng_timeout            = pdc_eng_timeout,
         .sff_irq_clear          = pdc20621_irq_clear,
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 5bddae19d1fb..2ecd32991522 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -5280,6 +5280,7 @@ static struct ata_port_operations ipr_sata_ops = {
         .sff_tf_read = ipr_tf_read,
         .qc_prep = ata_noop_qc_prep,
         .qc_issue = ipr_qc_issue,
+        .qc_fill_rtf = ata_sff_qc_fill_rtf,
         .port_start = ata_sas_port_start,
         .port_stop = ata_sas_port_stop
 };
diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
index a1664b87927a..2ec255839dcd 100644
--- a/drivers/scsi/libsas/sas_ata.c
+++ b/drivers/scsi/libsas/sas_ata.c
@@ -356,6 +356,7 @@ static struct ata_port_operations sas_sata_ops = {
         .sff_tf_read            = sas_ata_tf_read,
         .qc_prep                = ata_noop_qc_prep,
         .qc_issue               = sas_ata_qc_issue,
+        .qc_fill_rtf            = ata_sff_qc_fill_rtf,
         .port_start             = ata_sas_port_start,
         .port_stop              = ata_sas_port_stop,
         .scr_read               = sas_ata_scr_read,