[SCSI] Unify SAM_ and SAM_STAT_ macros

[deliverable/linux.git] / drivers / scsi / libsas / sas_ata.c

diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
index 88f7446725764b42a4d1eb7c54153605ea5dc9b8..042153cbbde131bdc9a631cb60c988dc7004ec44 100644 (file)
--- a/drivers/scsi/libsas/sas_ata.c
+++ b/drivers/scsi/libsas/sas_ata.c
@@ -71,7 +71,7 @@ static enum ata_completion_errors sas_to_ata_err(struct task_status_struct *ts)
                case SAS_SG_ERR:
                        return AC_ERR_INVALID;
 
-               case SAM_CHECK_COND:
+               case SAM_STAT_CHECK_CONDITION:
                case SAS_OPEN_TO:
                case SAS_OPEN_REJECT:
                        SAS_DPRINTK("%s: Saw error %d.  What to do?\n",
@@ -107,7 +107,7 @@ static void sas_ata_task_done(struct sas_task *task)
        sas_ha = dev->port->ha;
 
        spin_lock_irqsave(dev->sata_dev.ap->lock, flags);
-       if (stat->stat == SAS_PROTO_RESPONSE || stat->stat == SAM_GOOD) {
+       if (stat->stat == SAS_PROTO_RESPONSE || stat->stat == SAM_STAT_GOOD) {
                ata_tf_from_fis(resp->ending_fis, &dev->sata_dev.tf);
                qc->err_mask |= ac_err_mask(dev->sata_dev.tf.command);
                dev->sata_dev.sstatus = resp->sstatus;
@@ -395,12 +395,13 @@ int sas_ata_init_host_and_port(struct domain_device *found_dev,
 void sas_ata_task_abort(struct sas_task *task)
 {
        struct ata_queued_cmd *qc = task->uldd_task;
-       struct request_queue *q = qc->scsicmd->device->request_queue;
        struct completion *waiting;
-       unsigned long flags;
 
        /* Bounce SCSI-initiated commands to the SCSI EH */
        if (qc->scsicmd) {
+               struct request_queue *q = qc->scsicmd->device->request_queue;
+               unsigned long flags;
+
                spin_lock_irqsave(q->queue_lock, flags);
                blk_abort_request(qc->scsicmd->request);
                spin_unlock_irqrestore(q->queue_lock, flags);
@@ -510,12 +511,12 @@ static int sas_execute_task(struct sas_task *task, void *buffer, int size,
                                        goto ex_err;
                        }
                }
-               if (task->task_status.stat == SAM_BUSY ||
-                          task->task_status.stat == SAM_TASK_SET_FULL ||
+               if (task->task_status.stat == SAM_STAT_BUSY ||
+                          task->task_status.stat == SAM_STAT_TASK_SET_FULL ||
                           task->task_status.stat == SAS_QUEUE_FULL) {
                        SAS_DPRINTK("task: q busy, sleeping...\n");
                        schedule_timeout_interruptible(HZ);
-               } else if (task->task_status.stat == SAM_CHECK_COND) {
+               } else if (task->task_status.stat == SAM_STAT_CHECK_CONDITION) {
                        struct scsi_sense_hdr shdr;
 
                        if (!scsi_normalize_sense(ts->buf, ts->buf_valid_size,
@@ -548,7 +549,7 @@ static int sas_execute_task(struct sas_task *task, void *buffer, int size,
                                            shdr.asc, shdr.ascq);
                        }
                } else if (task->task_status.resp != SAS_TASK_COMPLETE ||
-                          task->task_status.stat != SAM_GOOD) {
+                          task->task_status.stat != SAM_STAT_GOOD) {
                        SAS_DPRINTK("task finished with resp:0x%x, "
                                    "stat:0x%x\n",
                                    task->task_status.resp,