diff options
| author |   Bart Van Assche <bart.vanassche@sandisk.com> | 2015-07-09 07:25:25 -0700 |
|---|---|---|
| committer |   James Bottomley <JBottomley@Odin.com> | 2015-08-26 10:45:02 -0700 |
| commit | 8a318fe16096a45c03e8c9a39449d1f750fafd27 (patch) | |
| tree | b2615094a6a97db52bf34fb7b3c7d9dc3ea54415 /drivers/scsi/qla2xxx | |
| parent | qla2xxx: Remove a superfluous test (diff) | |
| download | linux-dev-8a318fe16096a45c03e8c9a39449d1f750fafd27.tar.xz linux-dev-8a318fe16096a45c03e8c9a39449d1f750fafd27.zip | |
qla2xxx: Remove dead code
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>
Diffstat (limited to 'drivers/scsi/qla2xxx')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_nx.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c index 3d3ea84cca07..bb0ee7c604c7 100644 --- a/drivers/scsi/qla2xxx/qla_nx.c +++ b/drivers/scsi/qla2xxx/qla_nx.c @@ -2473,14 +2473,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; |