@@ -1641,8 +1641,8 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip,
return ret;
}
- pr_debug("MTD %s(): WRITE 0x%.8lx(0x%.8lx)\n",
- __func__, adr, datum.x[0]);
+ pr_debug("MTD %s(): WRITE 0x%.8lx(0x%.8lx)\n", __func__, adr,
+ datum.x[0]);
if (mode == FL_OTP_WRITE)
otp_enter(map, chip, adr, map_bankwidth(map));
@@ -1655,9 +1655,9 @@ 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;
+ pr_debug("MTD %s(): NOP\n", __func__);
+ do_write_oneword_done(map, chip, adr, mode);
+ return ret;
}
XIP_INVAL_CACHED_RANGE(map, adr, map_bankwidth(map));
@@ -1683,7 +1683,6 @@ 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;
This is just to refactor the function by removing the goto statement. Signed-off-by: Tokunori Ikegami <ikegami@allied-telesis.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 v1: - Add the patch. drivers/mtd/chips/cfi_cmdset_0002.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)