Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

[linux-2.6] / drivers / scsi / aic94xx / aic94xx_task.c

diff --git a/drivers/scsi/aic94xx/aic94xx_task.c b/drivers/scsi/aic94xx/aic94xx_task.c
index 663fdef38c52fecf009e1e3a19220c6e9d1e7169..326765c9caf869a00e7fd000dc075075eb03cfce 100644 (file)
--- a/drivers/scsi/aic94xx/aic94xx_task.c
+++ b/drivers/scsi/aic94xx/aic94xx_task.c
@@ -33,7 +33,7 @@ static void asd_unbuild_ata_ascb(struct asd_ascb *a);
 static void asd_unbuild_smp_ascb(struct asd_ascb *a);
 static void asd_unbuild_ssp_ascb(struct asd_ascb *a);
 
-static inline void asd_can_dequeue(struct asd_ha_struct *asd_ha, int num)
+static void asd_can_dequeue(struct asd_ha_struct *asd_ha, int num)
 {
        unsigned long flags;
 
@@ -51,9 +51,9 @@ static const u8 data_dir_flags[] = {
        [PCI_DMA_NONE]          = DATA_DIR_NONE, /* NO TRANSFER */
 };
 
-static inline int asd_map_scatterlist(struct sas_task *task,
-                                     struct sg_el *sg_arr,
-                                     gfp_t gfp_flags)
+static int asd_map_scatterlist(struct sas_task *task,
+                              struct sg_el *sg_arr,
+                              gfp_t gfp_flags)
 {
        struct asd_ascb *ascb = task->lldd_task;
        struct asd_ha_struct *asd_ha = ascb->ha;
@@ -131,7 +131,7 @@ err_unmap:
        return res;
 }
 
-static inline void asd_unmap_scatterlist(struct asd_ascb *ascb)
+static void asd_unmap_scatterlist(struct asd_ascb *ascb)
 {
        struct asd_ha_struct *asd_ha = ascb->ha;
        struct sas_task *task = ascb->uldd_task;
@@ -192,24 +192,8 @@ static void asd_get_response_tasklet(struct asd_ascb *ascb,
                        r + 16 + sizeof(struct ssp_frame_hdr);
 
                ts->residual = le32_to_cpu(*(__le32 *)r);
-               ts->resp = SAS_TASK_COMPLETE;
-               if (iu->datapres == 0)
-                       ts->stat = iu->status;
-               else if (iu->datapres == 1)
-                       ts->stat = iu->resp_data[3];
-               else if (iu->datapres == 2) {
-                       ts->stat = SAM_CHECK_COND;
-                       ts->buf_valid_size = min((u32) SAS_STATUS_BUF_SIZE,
-                                        be32_to_cpu(iu->sense_data_len));
-                       memcpy(ts->buf, iu->sense_data, ts->buf_valid_size);
-                       if (iu->status != SAM_CHECK_COND) {
-                               ASD_DPRINTK("device %llx sent sense data, but "
-                                           "stat(0x%x) is not CHECK_CONDITION"
-                                           "\n",
-                                           SAS_ADDR(task->dev->sas_addr),
-                                           iu->status);
-                       }
-               }
+
+               sas_ssp_task_response(&asd_ha->pcidev->dev, task, iu);
        }  else {
                struct ata_task_resp *resp = (void *) &ts->buf[0];
 
@@ -359,11 +343,13 @@ Again:
        task->task_state_flags &= ~SAS_TASK_AT_INITIATOR;
        task->task_state_flags |= SAS_TASK_STATE_DONE;
        if (unlikely((task->task_state_flags & SAS_TASK_STATE_ABORTED))) {
+               struct completion *completion = ascb->completion;
                spin_unlock_irqrestore(&task->task_state_lock, flags);
                ASD_DPRINTK("task 0x%p done with opcode 0x%x resp 0x%x "
                            "stat 0x%x but aborted by upper layer!\n",
                            task, opcode, ts->resp, ts->stat);
-               complete(&ascb->completion);
+               if (completion)
+                       complete(completion);
        } else {
                spin_unlock_irqrestore(&task->task_state_lock, flags);
                task->lldd_task = NULL;
@@ -541,7 +527,7 @@ static void asd_unbuild_ssp_ascb(struct asd_ascb *a)
 
 /* ---------- Execute Task ---------- */
 
-static inline int asd_can_queue(struct asd_ha_struct *asd_ha, int num)
+static int asd_can_queue(struct asd_ha_struct *asd_ha, int num)
 {
        int res = 0;
        unsigned long flags;