diff options
-rw-r--r-- | drivers/scsi/smartpqi/smartpqi.h | 6 | ||||
-rw-r--r-- | drivers/scsi/smartpqi/smartpqi_init.c | 4 |
2 files changed, 4 insertions, 6 deletions
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; | |||
545 | #define SOP_TASK_ATTRIBUTE_ORDERED 2 | 545 | #define SOP_TASK_ATTRIBUTE_ORDERED 2 |
546 | #define SOP_TASK_ATTRIBUTE_ACA 4 | 546 | #define SOP_TASK_ATTRIBUTE_ACA 4 |
547 | 547 | ||
548 | #define SOP_TASK_MANAGEMENT_FUNCTION_COMPLETE 0x0 | 548 | #define SOP_TMF_COMPLETE 0x0 |
549 | #define SOP_TASK_MANAGEMENT_FUNCTION_REJECTED 0x4 | 549 | #define SOP_TMF_FUNCTION_SUCCEEDED 0x8 |
550 | #define SOP_TASK_MANAGEMENT_FUNCTION_FAILED 0x5 | ||
551 | #define SOP_TASK_MANAGEMENT_FUNCTION_SUCCEEDED 0x8 | ||
552 | 550 | ||
553 | /* additional CDB bytes usage field codes */ | 551 | /* additional CDB bytes usage field codes */ |
554 | #define SOP_ADDITIONAL_CDB_BYTES_0 0 /* 16-byte CDB */ | 552 | #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( | |||
2469 | int rc; | 2469 | int rc; |
2470 | 2470 | ||
2471 | switch (response->response_code) { | 2471 | switch (response->response_code) { |
2472 | case SOP_TASK_MANAGEMENT_FUNCTION_COMPLETE: | 2472 | case SOP_TMF_COMPLETE: |
2473 | case SOP_TASK_MANAGEMENT_FUNCTION_SUCCEEDED: | 2473 | case SOP_TMF_FUNCTION_SUCCEEDED: |
2474 | rc = 0; | 2474 | rc = 0; |
2475 | break; | 2475 | break; |
2476 | default: | 2476 | default: |