sata_fsl,mv,nv: prepare for NCQ command completion update

Make the following changes to prepare for NCQ command completion
update.  Changes made by this patch don't cause any functional
difference.

* sata_fsl_host_intr(): rename the local variable qc_active to
  done_mask as that's what it is.

* mv_process_crpb_response(): restructure if clause for easier update.

* nv_adma_interrupt(): drop unnecessary error variable.

* nv_swncq_sdbfis(): drop unnecessary nr_done and return 0 on success.
  Typo fix.

* nv_swncq_dmafis(): drop unused return value and return void.

* nv_swncq_host_interrupt(): drop unnecessary return value handling.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Ashish Kalra <ashish.kalra@freescale.com>
Cc: Saeed Bishara <saeed@marvell.com>
Cc: Mark Lord <liml@rtr.ca>
Cc: Robert Hancock <hancockr@shaw.ca>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

1 files changed, 24 insertions, 23 deletions

diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index a476cd99b95d..9463c71dd38e 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -2716,34 +2716,35 @@ static void mv_err_intr(struct ata_port *ap)
 static void mv_process_crpb_response(struct ata_port *ap,
                 struct mv_crpb *response, unsigned int tag, int ncq_enabled)
 {
+        u8 ata_status;
+        u16 edma_status = le16_to_cpu(response->flags);
         struct ata_queued_cmd *qc = ata_qc_from_tag(ap, tag);
 
-        if (qc) {
-                u8 ata_status;
-                u16 edma_status = le16_to_cpu(response->flags);
-                /*
-                 * edma_status from a response queue entry:
-                 *   LSB is from EDMA_ERR_IRQ_CAUSE (non-NCQ only).
-                 *   MSB is saved ATA status from command completion.
-                 */
-                if (!ncq_enabled) {
-                        u8 err_cause = edma_status & 0xff & ~EDMA_ERR_DEV;
-                        if (err_cause) {
-                                /*
-                                 * Error will be seen/handled by mv_err_intr().
-                                 * So do nothing at all here.
-                                 */
-                                return;
-                        }
-                }
-                ata_status = edma_status >> CRPB_FLAG_STATUS_SHIFT;
-                if (!ac_err_mask(ata_status))
-                        ata_qc_complete(qc);
-                /* else: leave it for mv_err_intr() */
-        } else {
+        if (unlikely(!qc)) {
                 ata_port_printk(ap, KERN_ERR, "%s: no qc for tag=%d\n",
                                 __func__, tag);
+                return;
+        }
+
+        /*
+         * edma_status from a response queue entry:
+         *   LSB is from EDMA_ERR_IRQ_CAUSE (non-NCQ only).
+         *   MSB is saved ATA status from command completion.
+         */
+        if (!ncq_enabled) {
+                u8 err_cause = edma_status & 0xff & ~EDMA_ERR_DEV;
+                if (err_cause) {
+                        /*
+                         * Error will be seen/handled by
+                         * mv_err_intr().  So do nothing at all here.
+                         */
+                        return;
+                }
         }
+        ata_status = edma_status >> CRPB_FLAG_STATUS_SHIFT;
+        if (!ac_err_mask(ata_status))
+                ata_qc_complete(qc);
+        /* else: leave it for mv_err_intr() */
 }
 
 static void mv_process_crpb_entries(struct ata_port *ap, struct mv_port_priv *pp)