From: Kevin Barnett Date: Wed, 31 Aug 2016 19:54:17 +0000 (-0500) Subject: scsi: smartpqi: change tmf macro names X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b17f048658c9b1bc8ac1d9a54b223f740c70f8fd;p=linux-beck.git scsi: smartpqi: change tmf macro names small change to make code look cleaner Reviewed-by: Scott Teel Reviewed-by: Scott Benesh Reviewed-by: Johannes Thumshirn Reviewed-by: Tomas Henzl Signed-off-by: Kevin Barnett Signed-off-by: Don Brace Signed-off-by: Martin K. Petersen --- diff --git a/drivers/scsi/smartpqi/smartpqi.h b/drivers/scsi/smartpqi/smartpqi.h index ea4900588f48..dbcdb03feabf 100644 --- a/drivers/scsi/smartpqi/smartpqi.h +++ b/drivers/scsi/smartpqi/smartpqi.h @@ -545,10 +545,8 @@ typedef u32 pqi_index_t; #define SOP_TASK_ATTRIBUTE_ORDERED 2 #define SOP_TASK_ATTRIBUTE_ACA 4 -#define SOP_TASK_MANAGEMENT_FUNCTION_COMPLETE 0x0 -#define SOP_TASK_MANAGEMENT_FUNCTION_REJECTED 0x4 -#define SOP_TASK_MANAGEMENT_FUNCTION_FAILED 0x5 -#define SOP_TASK_MANAGEMENT_FUNCTION_SUCCEEDED 0x8 +#define SOP_TMF_COMPLETE 0x0 +#define SOP_TMF_FUNCTION_SUCCEEDED 0x8 /* additional CDB bytes usage field codes */ #define SOP_ADDITIONAL_CDB_BYTES_0 0 /* 16-byte CDB */ diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c index 418f63670d71..6eab38e0d5e9 100644 --- a/drivers/scsi/smartpqi/smartpqi_init.c +++ b/drivers/scsi/smartpqi/smartpqi_init.c @@ -2469,8 +2469,8 @@ static int pqi_interpret_task_management_response( int rc; switch (response->response_code) { - case SOP_TASK_MANAGEMENT_FUNCTION_COMPLETE: - case SOP_TASK_MANAGEMENT_FUNCTION_SUCCEEDED: + case SOP_TMF_COMPLETE: + case SOP_TMF_FUNCTION_SUCCEEDED: rc = 0; break; default: