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

Commit 6d07fcf7 authored by Akinobu Mita's avatar Akinobu Mita Committed by David Woodhouse
Browse files

mtd: nandsim: use NS_RAW_OFFSET() 



Use NS_RAW_OFFSET() to calculate the page offset in flash RAM image by
(row, column) address.

Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 3b8b8fa1

drivers/mtd/nand/nandsim.c

+2 −2
Original line number Diff line number Diff line
@@ -1489,7 +1489,7 @@ static void read_page(struct nandsim *ns, int num) 
				ns->regs.row, ns->regs.column + ns->regs.off);

			if (do_read_error(ns, num))

				return;

			pos = (loff_t)ns->regs.row * ns->geom.pgszoob + ns->regs.column + ns->regs.off;

			pos = (loff_t)NS_RAW_OFFSET(ns) + ns->regs.off;

			tx = read_file(ns, ns->cfile, ns->buf.byte, num, pos);

			if (tx != num) {

				NS_ERR("read_page: read error for page %d ret %ld\n", ns->regs.row, (long)tx);
@@ -1558,7 +1558,7 @@ static int prog_page(struct nandsim *ns, int num) 


		NS_DBG("prog_page: writing page %d\n", ns->regs.row);

		pg_off = ns->file_buf + ns->regs.column + ns->regs.off;

		off = (loff_t)ns->regs.row * ns->geom.pgszoob + ns->regs.column + ns->regs.off;

		off = (loff_t)NS_RAW_OFFSET(ns) + ns->regs.off;

		if (!test_bit(ns->regs.row, ns->pages_written)) {

			all = 1;

			memset(ns->file_buf, 0xff, ns->geom.pgszoob);