From: Tokunori Ikegami <ikegami.t@gmail.com>
To: Vignesh Raghavendra <vigneshr@ti.com>
Cc: Tokunori Ikegami <ikegami.t@gmail.com>,
Chris Packham <chris.packham@alliedtelesis.co.nz>,
linux-mtd@lists.infradead.org, Fabio Bettoni <fbettoni@gmail.com>,
Joakim Tjernlund <Joakim.Tjernlund@infinera.com>
Subject: [PATCH v8 5/9] mtd: cfi_cmdset_0002: Remove op_done goto statement from do_write_oneword()
Date: Tue, 6 Aug 2019 04:03:22 +0900 [thread overview]
Message-ID: <20190805190326.28772-6-ikegami.t@gmail.com> (raw)
In-Reply-To: <20190805190326.28772-1-ikegami.t@gmail.com>
This is just to refactor the function by removing the goto statement.
Signed-off-by: Tokunori Ikegami <ikegami.t@gmail.com>
Cc: Fabio Bettoni <fbettoni@gmail.com>
Co: Hauke Mehrtens <hauke@hauke-m.de>
Cc: Chris Packham <chris.packham@alliedtelesis.co.nz>
Cc: Joakim Tjernlund <Joakim.Tjernlund@infinera.com>
Cc: linux-mtd@lists.infradead.org
---
Changes since v7:
- None.
Changes since v6:
- Removed the tag of Koen Vandeputte as same with the v7 1/9 patch.
Changes since v5:
- Rebased on top of Liu Jian's fixes in master.
- Change the email address of Tokunori Ikegami to ikegami.t@gmail.com.
Changes since v4:
- None.
Changes since v3:
- Rebased on the patch v4 01/11.
- Change the email address of Tokunori Ikegami to ikegami_to@yahoo.co.jp.
Changes since v2:
- Just rebased.
Changes since v1:
- Add the patch.
drivers/mtd/chips/cfi_cmdset_0002.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index 67640eded881..dea63842dec9 100644
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -1766,7 +1766,8 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip,
oldd = map_read(map, adr);
if (map_word_equal(map, oldd, datum)) {
pr_debug("MTD %s(): NOP\n", __func__);
- goto op_done;
+ do_write_oneword_done(map, chip, adr, mode);
+ return ret;
}
XIP_INVAL_CACHED_RANGE(map, adr, map_bankwidth(map));
@@ -1787,7 +1788,7 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip,
}
}
xip_enable(map, chip, adr);
- op_done:
+
do_write_oneword_done(map, chip, adr, mode);
return ret;
--
2.11.0
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2019-08-05 19:04 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-05 19:03 [PATCH v8 0/9] mtd: cfi_cmdset_0002: Fix flash write issue for OpenWrt Project Tokunori Ikegami
2019-08-05 19:03 ` [PATCH v8 1/9] mtd: cfi_cmdset_0002: Use chip_good() to retry in do_write_oneword() Tokunori Ikegami
2019-08-06 0:43 ` Sasha Levin
2019-08-06 14:30 ` Tokunori Ikegami
2019-09-17 18:04 ` Tokunori Ikegami
2019-09-18 5:29 ` Vignesh Raghavendra
2019-09-18 13:40 ` Tokunori Ikegami
2019-08-05 19:03 ` [PATCH v8 2/9] mtd: cfi_cmdset_0002: Remove goto statement from do_write_buffer() Tokunori Ikegami
2019-08-05 19:03 ` [PATCH v8 3/9] mtd: cfi_cmdset_0002: Split do_write_oneword() to reduce function size Tokunori Ikegami
2019-08-05 19:03 ` [PATCH v8 4/9] mtd: cfi_cmdset_0002: Split do_write_oneword() op_done goto statement Tokunori Ikegami
2019-08-05 19:03 ` Tokunori Ikegami [this message]
2019-08-05 19:03 ` [PATCH v8 6/9] mtd: cfi_cmdset_0002: Split write-to-buffer-reset sequence Tokunori Ikegami
2019-08-05 19:03 ` [PATCH v8 7/9] mtd: cfi_cmdset_0002: Split to wait write buffer to check if completed Tokunori Ikegami
2019-08-05 19:03 ` [PATCH v8 8/9] mtd: cfi_cmdset_0002: Split do_write_oneword() to reduce exit paths Tokunori Ikegami
2019-08-05 19:03 ` [PATCH v8 9/9] mtd: cfi_cmdset_0002: Disable write buffer functions if FORCE_WORD_WRITE is 1 Tokunori Ikegami
2019-09-17 4:20 ` [PATCH v8 0/9] mtd: cfi_cmdset_0002: Fix flash write issue for OpenWrt Project Vignesh Raghavendra
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=20190805190326.28772-6-ikegami.t@gmail.com \
--to=ikegami.t@gmail.com \
--cc=Joakim.Tjernlund@infinera.com \
--cc=chris.packham@alliedtelesis.co.nz \
--cc=fbettoni@gmail.com \
--cc=linux-mtd@lists.infradead.org \
--cc=vigneshr@ti.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 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).