From: Bart Van Assche <bart.vanassche@sandisk.com>
To: James Bottomley <jbottomley@odin.com>
Cc: Himanshu Madhani <himanshu.madhani@qlogic.com>,
Quinn Tran <quinn.tran@qlogic.com>,
Saurav Kashyap <saurav.kashyap@qlogic.com>,
"linux-scsi@vger.kernel.org" <linux-scsi@vger.kernel.org>
Subject: [PATCH 08/10] qla2xxx: Remove unreachable code
Date: Thu, 4 Jun 2015 15:56:41 -0700 [thread overview]
Message-ID: <5570D7A9.7050505@sandisk.com> (raw)
In-Reply-To: <5570D656.9050704@sandisk.com>
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>
Cc: Quinn Tran <quinn.tran@qlogic.com>
Cc: Saurav Kashyap <saurav.kashyap@qlogic.com>
---
drivers/scsi/qla2xxx/qla_nx.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
index 678fb5b..b359a83 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;
--
2.1.4
next prev parent reply other threads:[~2015-06-04 22:56 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-04 22:51 [PATCH v2 0/10] qla2xxx: Fix various warnings reported by static source code analysis tools Bart Van Assche
2015-06-04 22:52 ` [PATCH 01/10] qla2xxx: Declare local functions static Bart Van Assche
2015-06-04 22:53 ` [PATCH 02/10] qla2xxx: Remove set-but-not-used variables Bart Van Assche
2015-06-04 22:53 ` [PATCH 03/10] qla2xxx: Replace two macros with an inline function Bart Van Assche
2015-06-04 22:54 ` [PATCH 04/10] qla2xxx: Remove __constant_ prefix Bart Van Assche
2015-06-04 22:55 ` [PATCH 05/10] qla2xxx: Specify the [noderef] attribute once Bart Van Assche
2015-06-04 22:55 ` [PATCH 06/10] qla2xxx: Fix sparse annotations Bart Van Assche
2015-06-04 22:56 ` [PATCH 07/10] qla2xxx: Remove a superfluous test Bart Van Assche
2015-06-04 22:56 ` Bart Van Assche [this message]
2015-06-04 22:57 ` [PATCH 09/10] qla2xxx: Comment out unreachable code Bart Van Assche
2015-06-11 4:43 ` Himanshu Madhani
2015-06-04 22:58 ` [PATCH 10/10] qla2xxx: Fix indentation Bart Van Assche
2015-06-11 4:45 ` Himanshu Madhani
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5570D7A9.7050505@sandisk.com \
--to=bart.vanassche@sandisk.com \
--cc=himanshu.madhani@qlogic.com \
--cc=jbottomley@odin.com \
--cc=linux-scsi@vger.kernel.org \
--cc=quinn.tran@qlogic.com \
--cc=saurav.kashyap@qlogic.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.