diff options
| author | Bart Van Assche <bart.vanassche@sandisk.com> | 2015-07-09 10:25:25 -0400 |
|---|---|---|
| committer | James Bottomley <JBottomley@Odin.com> | 2015-08-26 13:45:02 -0400 |
| commit | 8a318fe16096a45c03e8c9a39449d1f750fafd27 (patch) | |
| tree | b2615094a6a97db52bf34fb7b3c7d9dc3ea54415 /drivers/scsi/qla2xxx | |
| parent | 82e6afd49d9a5da8cdb648cb66e54432173298d7 (diff) | |
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: | |||
| 2473 | ql_log(ql_log_info, vha, 0x00a5, | 2473 | ql_log(ql_log_info, vha, 0x00a5, |
| 2474 | "Firmware loaded successfully from binary blob.\n"); | 2474 | "Firmware loaded successfully from binary blob.\n"); |
| 2475 | return QLA_SUCCESS; | 2475 | return QLA_SUCCESS; |
| 2476 | } else { | ||
| 2477 | ql_log(ql_log_fatal, vha, 0x00a6, | ||
| 2478 | "Firmware load failed for binary blob.\n"); | ||
| 2479 | blob->fw = NULL; | ||
| 2480 | blob = NULL; | ||
| 2481 | goto fw_load_failed; | ||
| 2482 | } | 2476 | } |
| 2483 | return QLA_SUCCESS; | 2477 | |
| 2478 | ql_log(ql_log_fatal, vha, 0x00a6, | ||
| 2479 | "Firmware load failed for binary blob.\n"); | ||
| 2480 | blob->fw = NULL; | ||
| 2481 | blob = NULL; | ||
| 2484 | 2482 | ||
| 2485 | fw_load_failed: | 2483 | fw_load_failed: |
| 2486 | return QLA_FUNCTION_FAILED; | 2484 | return QLA_FUNCTION_FAILED; |