aboutsummaryrefslogtreecommitdiff
path: root/drivers/scsi/isci/task.c
diff options
context:
space:
mode:
authorBartosz Barcinski <Bartosz.Barcinski@intel.com>2011-04-12 17:28:41 -0700
committerDan Williams <dan.j.williams@intel.com>2011-07-03 04:00:37 -0700
commit467e855a0331f619f41fbf7391bc29ec0ca923a0 (patch)
treeb41ed653dcb0b6a0f6c9ab1ee2cc5bfb129eda8c /drivers/scsi/isci/task.c
parent26bace349ecd08b1d744f7067d24fd1bedb91020 (diff)
isci: sparse warnings cleanup
Clean warnings and errors reported by sparse tool. request.c:430:50: warning: mixing different enum types remote_device.c:534:39: warning: symbol 'flags' shadows an earlier one task.c:495:44: warning: mixing different enum types scic_sds_controller.c:2155:24: warning: mixing different enum types scic_sds_controller.c:2272:36: warning: mixing different enum types scic_sds_controller.c:2911:38: warning: incorrect type in initializer (different address spaces) scic_sds_controller.c:2913:25: warning: incorrect type in argument 2 (different address spaces) scic_sds_request.c:875:34: warning: cast removes address space of expression scic_sds_request.c:876:123: warning: incorrect type in argument 2 (different address spaces) scic_sds_port.c:585:51: warning: incorrect type in assignment (different address spaces) scic_sds_port.c:712:9: warning: incorrect type in argument 2 (different address spaces) scic_sds_port.c:1770:25: warning: incorrect type in argument 2 (different address spaces) Signed-off-by: Bartosz Barcinski <Bartosz.Barcinski@intel.com> Signed-off-by: Maciej Patelczyk <maciej.patelczyk@intel.com> [fixed up some false positives and misconversions] Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/scsi/isci/task.c')
-rw-r--r--drivers/scsi/isci/task.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/isci/task.c b/drivers/scsi/isci/task.c
index aa6b43067e2..b88101e195d 100644
--- a/drivers/scsi/isci/task.c
+++ b/drivers/scsi/isci/task.c
@@ -429,7 +429,7 @@ int isci_task_execute_tmf(
unsigned long timeout_ms)
{
DECLARE_COMPLETION_ONSTACK(completion);
- enum sci_status status = SCI_FAILURE;
+ enum sci_task_status status = SCI_TASK_FAILURE;
struct scic_sds_remote_device *sci_device;
struct isci_remote_device *isci_device = tmf->device;
struct isci_request *request;
@@ -488,7 +488,7 @@ int isci_task_execute_tmf(
SCI_CONTROLLER_INVALID_IO_TAG
);
- if (status != SCI_SUCCESS) {
+ if (status != SCI_TASK_SUCCESS) {
dev_warn(&isci_host->pdev->dev,
"%s: start_io failed - status = 0x%x, request = %p\n",
__func__,