From: Tokunori Ikegami <ikegami_to@yahoo.co.jp>
To: Boris Brezillon <boris.brezillon@free-electrons.com>
Cc: Joakim Tjernlund <Joakim.Tjernlund@infinera.com>,
linux-mtd@lists.infradead.org,
Tokunori Ikegami <ikegami_to@yahoo.co.jp>,
Chris Packham <chris.packham@alliedtelesis.co.nz>,
Fabio Bettoni <fbettoni@gmail.com>
Subject: [PATCH v4 08/11] mtd: cfi_cmdset_0002: Remove retry goto statement from do_write_oneword()
Date: Tue, 5 Feb 2019 02:35:47 +0900 [thread overview]
Message-ID: <20190204173550.29703-9-ikegami_to@yahoo.co.jp> (raw)
In-Reply-To: <20190204173550.29703-1-ikegami_to@yahoo.co.jp>
This is just to refactor the function by removing the goto statement.
Change to use the for loop instead of the goto statement.
Signed-off-by: Tokunori Ikegami <ikegami_to@yahoo.co.jp>
Cc: Fabio Bettoni <fbettoni@gmail.com>
Co: Hauke Mehrtens <hauke@hauke-m.de>
Co: Koen Vandeputte <koen.vandeputte@ncentric.com>
Cc: Chris Packham <chris.packham@alliedtelesis.co.nz>
Cc: Joakim Tjernlund <Joakim.Tjernlund@infinera.com>
Cc: Boris Brezillon <boris.brezillon@free-electrons.com>
Cc: linux-mtd@lists.infradead.org
---
Changes since v3:
- Rebased.
- Change the email address of Tokunori Ikegami to ikegami_to@yahoo.co.jp.
Changes since v2:
- None.
Changes since v1:
- Add the patch.
drivers/mtd/chips/cfi_cmdset_0002.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index a5513bd..81f5e5e 100755
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -1679,17 +1679,15 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip,
ENABLE_VPP(map);
xip_disable(map, chip, adr);
- retry:
- ret = do_write_oneword_once(map, chip, adr, datum, mode, cfi);
- if (ret) {
+ for (retry_cnt = 0; retry_cnt < MAX_RETRIES; retry_cnt++) {
+ ret = do_write_oneword_once(map, chip, adr, datum, mode, cfi);
+ if (!ret)
+ break;
+
/* reset on all failures. */
map_write(map, CMD(0xF0), chip->start);
- /* FIXME - should have reset delay before continuing */
- if (++retry_cnt <= MAX_RETRIES) {
- ret = 0;
- goto retry;
- }
+ /* FIXME - should have reset delay before continuing */
}
xip_enable(map, chip, adr);
--
2.11.0
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2019-02-04 17:38 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-04 17:35 [PATCH v4 00/11] mtd: cfi_cmdset_0002: Fix flash write issue for OpenWrt Project Tokunori Ikegami
2019-02-04 17:35 ` [PATCH v4 01/11] mtd: cfi_cmdset_0002: Use chip_good() to retry in do_write_oneword() Tokunori Ikegami
2019-02-04 17:35 ` [PATCH v4 02/11] mtd: cfi_cmdset_0002: Remove chip_ready() from do_write_buffer() Tokunori Ikegami
2019-02-04 18:05 ` Boris Brezillon
2019-02-04 18:27 ` Tokunori Ikegami
2019-02-05 13:15 ` Tokunori Ikegami
2019-02-04 17:35 ` [PATCH v4 03/11] mtd: cfi_cmdset_0002: Remove goto statement " Tokunori Ikegami
2019-02-04 17:35 ` [PATCH v4 04/11] mtd: cfi_cmdset_0002: Call xip_enable() once only in do_write_buffer() Tokunori Ikegami
2019-02-04 17:35 ` [PATCH v4 05/11] mtd: cfi_cmdset_0002: Split do_write_oneword() to reduce function size Tokunori Ikegami
2019-02-04 17:35 ` [PATCH v4 06/11] mtd: cfi_cmdset_0002: Split do_write_oneword() op_done goto statement Tokunori Ikegami
2019-02-04 17:35 ` [PATCH v4 07/11] mtd: cfi_cmdset_0002: Remove op_done goto statement from do_write_oneword() Tokunori Ikegami
2019-02-04 17:35 ` Tokunori Ikegami [this message]
2019-02-04 17:35 ` [PATCH v4 09/11] mtd: cfi_cmdset_0002: Split write-to-buffer-reset sequence Tokunori Ikegami
2019-02-04 17:35 ` [PATCH v4 10/11] mtd: cfi_cmdset_0002: Split to wait write buffer to check if completed Tokunori Ikegami
2019-02-04 17:35 ` [PATCH v4 11/11] mtd: cfi_cmdset_0002: Split do_write_oneword() to reduce exit paths Tokunori Ikegami
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=20190204173550.29703-9-ikegami_to@yahoo.co.jp \
--to=ikegami_to@yahoo.co.jp \
--cc=Joakim.Tjernlund@infinera.com \
--cc=boris.brezillon@free-electrons.com \
--cc=chris.packham@alliedtelesis.co.nz \
--cc=fbettoni@gmail.com \
--cc=linux-mtd@lists.infradead.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).