megaraid_sas: Code optimization build_and_issue_cmd return-type

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>

2 files changed, 4 insertions, 9 deletions

diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index 8df58c2b08ec..edf8911bdb12 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -1636,7 +1636,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;
 }
 
 
@@ -1728,12 +1728,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 1351cae6acff..f5538303a9bc 100644
--- 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;