[SCSI] Unify SAM_ and SAM_STAT_ macros

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / aic94xx / aic94xx_task.c

diff --git a/drivers/scsi/aic94xx/aic94xx_task.c b/drivers/scsi/aic94xx/aic94xx_task.c
index 008df9ab92a5f89b57c8f8cf36fa8ede7abc36d8..532d212b6b2c7b633a9b4338da14c78439a1d3db 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;
@@ -223,7 +223,7 @@ Again:
        switch (opcode) {
        case TC_NO_ERROR:
                ts->resp = SAS_TASK_COMPLETE;
-               ts->stat = SAM_GOOD;
+               ts->stat = SAM_STAT_GOOD;
                break;
        case TC_UNDERRUN:
                ts->resp = SAS_TASK_COMPLETE;
@@ -320,7 +320,7 @@ Again:
        case TC_RESUME:
        case TC_PARTIAL_SG_LIST:
        default:
-               ASD_DPRINTK("%s: dl opcode: 0x%x?\n", __FUNCTION__, opcode);
+               ASD_DPRINTK("%s: dl opcode: 0x%x?\n", __func__, opcode);
                break;
        }
 
@@ -527,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;