Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 228c05c2 authored by Tokunori Ikegami's avatar Tokunori Ikegami Committed by Vignesh Raghavendra
Browse files

mtd: cfi_cmdset_0002: Split do_write_oneword() op_done goto statement 



To reduce function size and to remove the goto statement, split the
op_done goto statement part into do_write_oneword_done(). Also
split the start part into do_write_oneword_start() to be symmetrical.

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
Signed-off-by: default avatarTokunori Ikegami <ikegami.t@gmail.com>
[vigneshr@ti.com: Reword commit message]
Signed-off-by: default avatarVignesh Raghavendra <vigneshr@ti.com>
parent a371ba57

drivers/mtd/chips/cfi_cmdset_0002.c

+43 −19
Original line number Diff line number Diff line
@@ -1705,6 +1705,40 @@ static int __xipram do_write_oneword_once(struct map_info *map, 
	return ret;

}



static int __xipram do_write_oneword_start(struct map_info *map,

					   struct flchip *chip,

					   unsigned long adr, int mode)

{

	int ret = 0;



	mutex_lock(&chip->mutex);



	ret = get_chip(map, chip, adr, mode);

	if (ret) {

		mutex_unlock(&chip->mutex);

		return ret;

	}



	if (mode == FL_OTP_WRITE)

		otp_enter(map, chip, adr, map_bankwidth(map));



	return ret;

}



static void __xipram do_write_oneword_done(struct map_info *map,

					   struct flchip *chip,

					   unsigned long adr, int mode)

{

	if (mode == FL_OTP_WRITE)

		otp_exit(map, chip, adr, map_bankwidth(map));



	chip->state = FL_READY;

	DISABLE_VPP(map);

	put_chip(map, chip, adr);



	mutex_unlock(&chip->mutex);

}



static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip,

				     unsigned long adr, map_word datum,

				     int mode)
@@ -1716,19 +1750,14 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip, 


	adr += chip->start;



	mutex_lock(&chip->mutex);

	ret = get_chip(map, chip, adr, mode);

	pr_debug("MTD %s(): WRITE 0x%.8lx(0x%.8lx)\n", __func__, adr,

		 datum.x[0]);



	ret = do_write_oneword_start(map, chip, adr, mode);

	if (ret) {

		mutex_unlock(&chip->mutex);

		return ret;

	}



	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));



	/*

	 * Check for a NOP for the case when the datum to write is already

	 * present - it saves time and works around buggy chips that corrupt
@@ -1737,9 +1766,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));
@@ -1760,13 +1789,8 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip, 
		}

	}

	xip_enable(map, chip, adr);

 op_done:

	if (mode == FL_OTP_WRITE)

		otp_exit(map, chip, adr, map_bankwidth(map));

	chip->state = FL_READY;

	DISABLE_VPP(map);

	put_chip(map, chip, adr);

	mutex_unlock(&chip->mutex);



	do_write_oneword_done(map, chip, adr, mode);



	return ret;

}