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

Commit fcbb6af1 authored by Boris Brezillon's avatar Boris Brezillon Committed by Richard Weinberger
Browse files

UBI: fastmap: use ubi_io_{read, write}_data() instead of ubi_io_{read, write}() 



ubi_io_{read,write}_data() are wrappers around ubi_io_{read/write}() that
are used to read/write eraseblock payload data, which is exactly what
fastmap does when calling ubi_io_{read,write}().

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent f2fb1346

drivers/mtd/ubi/fastmap.c

+5 −5
Original line number Diff line number Diff line
@@ -878,7 +878,7 @@ int ubi_scan_fastmap(struct ubi_device *ubi, struct ubi_attach_info *ai, 
		goto out;

	}



	ret = ubi_io_read(ubi, fmsb, fm_anchor, ubi->leb_start, sizeof(*fmsb));

	ret = ubi_io_read_data(ubi, fmsb, fm_anchor, 0, sizeof(*fmsb));

	if (ret && ret != UBI_IO_BITFLIPS)

		goto free_fm_sb;

	else if (ret == UBI_IO_BITFLIPS)
@@ -996,8 +996,8 @@ int ubi_scan_fastmap(struct ubi_device *ubi, struct ubi_attach_info *ai, 
		if (sqnum < be64_to_cpu(vh->sqnum))

			sqnum = be64_to_cpu(vh->sqnum);



		ret = ubi_io_read(ubi, ubi->fm_buf + (ubi->leb_size * i), pnum,

				  ubi->leb_start, ubi->leb_size);

		ret = ubi_io_read_data(ubi, ubi->fm_buf + (ubi->leb_size * i),

				       pnum, 0, ubi->leb_size);

		if (ret && ret != UBI_IO_BITFLIPS) {

			ubi_err(ubi, "unable to read fastmap block# %i (PEB: %i, "

				"err: %i)", i, pnum, ret);
@@ -1311,8 +1311,8 @@ static int ubi_write_fastmap(struct ubi_device *ubi, 
	}



	for (i = 0; i < new_fm->used_blocks; i++) {

		ret = ubi_io_write(ubi, fm_raw + (i * ubi->leb_size),

			new_fm->e[i]->pnum, ubi->leb_start, ubi->leb_size);

		ret = ubi_io_write_data(ubi, fm_raw + (i * ubi->leb_size),

					new_fm->e[i]->pnum, 0, ubi->leb_size);

		if (ret) {

			ubi_err(ubi, "unable to write fastmap to PEB %i!",

				new_fm->e[i]->pnum);