qla2xxx: Remove dead code

Orabug: 21946579

The "return QLA_SUCCESS" statement just above the "fw_load_failed"
label cannot be reached, hence remove it. Additionally remove the
"else" keyword since the code block below the if-statement ends
with a return statement.

Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Acked-by: Himanshu Madhani <himanshu.madhani@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
Signed-off-by: Dan Duval <dan.duval@oracle.com>

diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
index 287a182c913385c21808112d51c7c1d460f4a947..d16d52fa783ac593679cede9fec251d1979fc047 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_nx.c
+++ b/drivers/scsi/qla2xxx/qla_nx.c
@@ -2478,14 +2478,12 @@ try_blob_fw:
                ql_log(ql_log_info, vha, 0x00a5,
                    "Firmware loaded successfully from binary blob.\n");
                return QLA_SUCCESS;
-       } else {
-               ql_log(ql_log_fatal, vha, 0x00a6,
-                   "Firmware load failed for binary blob.\n");
-               blob->fw = NULL;
-               blob = NULL;
-               goto fw_load_failed;
        }
-       return QLA_SUCCESS;
+
+       ql_log(ql_log_fatal, vha, 0x00a6,
+              "Firmware load failed for binary blob.\n");
+       blob->fw = NULL;
+       blob = NULL;
 
 fw_load_failed:
        return QLA_FUNCTION_FAILED;