From: Bart Van Assche <bvanassche@acm.org>
To: "Martin K . Petersen" <martin.petersen@oracle.com>,
"James E . J . Bottomley" <jejb@linux.vnet.ibm.com>
Cc: linux-scsi@vger.kernel.org, Bart Van Assche <bvanassche@acm.org>,
Nilesh Javali <njavali@marvell.com>,
Quinn Tran <qutran@marvell.com>,
Himanshu Madhani <himanshu.madhani@oracle.com>,
Daniel Wagner <dwagner@suse.de>, Martin Wilck <mwilck@suse.com>,
Roman Bolshakov <r.bolshakov@yadro.com>
Subject: [PATCH 3/9] qla2xxx: Make qla82xx_flash_wait_write_finish() easier to read
Date: Sun, 14 Jun 2020 15:39:15 -0700 [thread overview]
Message-ID: <20200614223921.5851-4-bvanassche@acm.org> (raw)
In-Reply-To: <20200614223921.5851-1-bvanassche@acm.org>
Return early instead of having a single return statement at the end of this
function. This patch fixes the following sparse warning:
qla_nx.c:1018: qla82xx_flash_wait_write_finish() error: uninitialized symbol 'val'.
Cc: Nilesh Javali <njavali@marvell.com>
Cc: Quinn Tran <qutran@marvell.com>
Cc: Himanshu Madhani <himanshu.madhani@oracle.com>
Cc: Daniel Wagner <dwagner@suse.de>
Cc: Martin Wilck <mwilck@suse.com>
Cc: Roman Bolshakov <r.bolshakov@yadro.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
drivers/scsi/qla2xxx/qla_nx.c | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
index 0baf55b7e88f..ff365b434a02 100644
--- a/drivers/scsi/qla2xxx/qla_nx.c
+++ b/drivers/scsi/qla2xxx/qla_nx.c
@@ -966,26 +966,21 @@ qla82xx_read_status_reg(struct qla_hw_data *ha, uint32_t *val)
static int
qla82xx_flash_wait_write_finish(struct qla_hw_data *ha)
{
- long timeout = 0;
- uint32_t done = 1 ;
uint32_t val;
- int ret = 0;
+ int i, ret;
scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev);
qla82xx_wr_32(ha, QLA82XX_ROMUSB_ROM_ABYTE_CNT, 0);
- while ((done != 0) && (ret == 0)) {
+ for (i = 0; i < 50000; i++) {
ret = qla82xx_read_status_reg(ha, &val);
- done = val & 1;
- timeout++;
+ if (ret < 0 || (val & 1) == 0)
+ return ret;
udelay(10);
cond_resched();
- if (timeout >= 50000) {
- ql_log(ql_log_warn, vha, 0xb00d,
- "Timeout reached waiting for write finish.\n");
- return -1;
- }
}
- return ret;
+ ql_log(ql_log_warn, vha, 0xb00d,
+ "Timeout reached waiting for write finish.\n");
+ return -1;
}
static int
next prev parent reply other threads:[~2020-06-14 22:39 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-14 22:39 [PATCH 0/9] qla2xxx patches for kernel v5.9 Bart Van Assche
2020-06-14 22:39 ` [PATCH 1/9] qla2xxx: Check the size of struct fcp_hdr at compile time Bart Van Assche
2020-06-23 7:59 ` Daniel Wagner
2020-06-14 22:39 ` [PATCH 2/9] qla2xxx: Remove the __packed annotation from struct fcp_hdr and fcp_hdr_le Bart Van Assche
2020-06-23 8:13 ` Daniel Wagner
2020-06-14 22:39 ` Bart Van Assche [this message]
2020-06-23 8:15 ` [PATCH 3/9] qla2xxx: Make qla82xx_flash_wait_write_finish() easier to read Daniel Wagner
2020-06-14 22:39 ` [PATCH 4/9] qla2xxx: Initialize 'n' before using it Bart Van Assche
2020-06-23 8:17 ` Daniel Wagner
2020-06-23 17:25 ` Shyam Sundar
2020-06-14 22:39 ` [PATCH 5/9] qla2xxx: Remove a superfluous cast Bart Van Assche
2020-06-23 8:19 ` Daniel Wagner
2020-06-14 22:39 ` [PATCH 6/9] qla2xxx: Make __qla2x00_alloc_iocbs() initialize 32 bits of request_t.handle Bart Van Assche
2020-06-23 8:25 ` Daniel Wagner
2020-06-14 22:39 ` [PATCH 7/9] qla2xxx: Fix a Coverity complaint in qla2100_fw_dump() Bart Van Assche
2020-06-23 8:33 ` Daniel Wagner
2020-06-28 22:31 ` Bart Van Assche
2020-06-29 7:01 ` Daniel Wagner
2020-06-14 22:39 ` [PATCH 8/9] qla2xxx: Make qla2x00_restart_isp() easier to read Bart Van Assche
2020-06-23 8:36 ` Daniel Wagner
2020-06-14 22:39 ` [PATCH 9/9] qla2xxx: Introduce a function for computing the debug message prefix Bart Van Assche
2020-06-23 8:39 ` Daniel Wagner
2020-06-22 22:07 ` [PATCH 0/9] qla2xxx patches for kernel v5.9 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=20200614223921.5851-4-bvanassche@acm.org \
--to=bvanassche@acm.org \
--cc=dwagner@suse.de \
--cc=himanshu.madhani@oracle.com \
--cc=jejb@linux.vnet.ibm.com \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=mwilck@suse.com \
--cc=njavali@marvell.com \
--cc=qutran@marvell.com \
--cc=r.bolshakov@yadro.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.