megaraid_sas: Code optimization build_and_issue_cmd return-type

Orabug: 22620626

build_and_issue_cmd should return SCSI_MLQUEUE_HOST_BUSY for a few error
cases instead of returning 1.

Signed-off-by: Sumit Saxena <sumit.saxena@avagotech.com>
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
(cherry picked from commit f9a9dee6a1fd8570884a0ab6f19c6b5cca05bd49)
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index 7584d52b5eb1b1a8ff3e64f4882572879dda803b..1793060a6ac1f5fe0bb50e3bd841b8de5758c2f5 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -1637,7 +1637,7 @@ megasas_build_and_issue_cmd(struct megasas_instance *instance,
        return 0;
 out_return_cmd:
        megasas_return_cmd(instance, cmd);
-       return 1;
+       return SCSI_MLQUEUE_HOST_BUSY;
 }
 
 
@@ -1729,12 +1729,7 @@ megasas_queue_command(struct Scsi_Host *shost, struct scsi_cmnd *scmd)
                break;
        }
 
-       if (instance->instancet->build_and_issue_cmd(instance, scmd)) {
-               dev_err(&instance->pdev->dev, "Err returned from build_and_issue_cmd\n");
-               return SCSI_MLQUEUE_HOST_BUSY;
-       }
-
-       return 0;
+       return instance->instancet->build_and_issue_cmd(instance, scmd);
 
  out_done:
        scmd->scsi_done(scmd);

diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c
index c9ad9d84f0c4150df0cd54a3dd117c5a55bf4b35..8c878a907d3d21460760ec14726e7eee9ba540a0 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
@@ -2125,7 +2125,7 @@ megasas_build_and_issue_cmd_fusion(struct megasas_instance *instance,
 
        req_desc = megasas_get_request_descriptor(instance, index-1);
        if (!req_desc)
-               return 1;
+               return SCSI_MLQUEUE_HOST_BUSY;
 
        req_desc->Words = 0;
        cmd->request_desc = req_desc;
@@ -2134,7 +2134,7 @@ megasas_build_and_issue_cmd_fusion(struct megasas_instance *instance,
                megasas_return_cmd_fusion(instance, cmd);
                dev_err(&instance->pdev->dev, "Error building command\n");
                cmd->request_desc = NULL;
-               return 1;
+               return SCSI_MLQUEUE_HOST_BUSY;
        }
 
        req_desc = cmd->request_desc;