[PATCH] libata: move err_mask to ata_queued_cmd

  - remove err_mask from the parameter list of the complete functions
  - move err_mask to ata_queued_cmd
  - initialize qc->err_mask when needed
  - for each function call to ata_qc_complete(), replace the err_mask parameter with qc->err_mask.

Signed-off-by: Albert Lee <albertcc@tw.ibm.com>

===============
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

1 files changed, 10 insertions, 5 deletions

diff --git a/drivers/scsi/sata_sil24.c b/drivers/scsi/sata_sil24.c
index e0d6f194f54f..a0ad3ed2200a 100644
--- a/drivers/scsi/sata_sil24.c
+++ b/drivers/scsi/sata_sil24.c
@@ -654,7 +654,8 @@ static void sil24_eng_timeout(struct ata_port *ap)
          */
         printk(KERN_ERR "ata%u: command timeout\n", ap->id);
         qc->scsidone = scsi_finish_command;
-        ata_qc_complete(qc, AC_ERR_OTHER);
+        qc->err_mask |= AC_ERR_OTHER;
+        ata_qc_complete(qc);
 
         sil24_reset_controller(ap);
 }
@@ -711,8 +712,10 @@ static void sil24_error_intr(struct ata_port *ap, u32 slot_stat)
                 sil24_reset_controller(ap);
         }
 
-        if (qc)
-                ata_qc_complete(qc, err_mask);
+        if (qc) {
+                qc->err_mask |= err_mask;
+                ata_qc_complete(qc);
+        }
 }
 
 static inline void sil24_host_intr(struct ata_port *ap)
@@ -734,8 +737,10 @@ static inline void sil24_host_intr(struct ata_port *ap)
                  */
                 sil24_update_tf(ap);
 
-                if (qc)
-                        ata_qc_complete(qc, ac_err_mask(pp->tf.command));
+                if (qc) {
+                        qc->err_mask |= ac_err_mask(pp->tf.command);
+                        ata_qc_complete(qc);
+                }
         } else
                 sil24_error_intr(ap, slot_stat);
 }