aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBoris Brezillon <boris.brezillon@free-electrons.com>2016-09-16 10:59:17 -0400
committerRichard Weinberger <richard@nod.at>2016-10-02 16:48:14 -0400
commitfcbb6af17bda4b3856a1f4c302da5d0d7bf9a0f9 (patch)
tree6fe4af684cc1df43d5ae43b601eeebf09a35675f
parentf2fb1346b3806a9b6b06cc80fe18760debc933f4 (diff)
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: Boris Brezillon <boris.brezillon@free-electrons.com> Signed-off-by: Richard Weinberger <richard@nod.at>
-rw-r--r--drivers/mtd/ubi/fastmap.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c
index 1bfb4aeb67d4..7a07b8b53081 100644
--- a/drivers/mtd/ubi/fastmap.c
+++ b/drivers/mtd/ubi/fastmap.c
@@ -878,7 +878,7 @@ int ubi_scan_fastmap(struct ubi_device *ubi, struct ubi_attach_info *ai,
878 goto out; 878 goto out;
879 } 879 }
880 880
881 ret = ubi_io_read(ubi, fmsb, fm_anchor, ubi->leb_start, sizeof(*fmsb)); 881 ret = ubi_io_read_data(ubi, fmsb, fm_anchor, 0, sizeof(*fmsb));
882 if (ret && ret != UBI_IO_BITFLIPS) 882 if (ret && ret != UBI_IO_BITFLIPS)
883 goto free_fm_sb; 883 goto free_fm_sb;
884 else if (ret == UBI_IO_BITFLIPS) 884 else if (ret == UBI_IO_BITFLIPS)
@@ -996,8 +996,8 @@ int ubi_scan_fastmap(struct ubi_device *ubi, struct ubi_attach_info *ai,
996 if (sqnum < be64_to_cpu(vh->sqnum)) 996 if (sqnum < be64_to_cpu(vh->sqnum))
997 sqnum = be64_to_cpu(vh->sqnum); 997 sqnum = be64_to_cpu(vh->sqnum);
998 998
999 ret = ubi_io_read(ubi, ubi->fm_buf + (ubi->leb_size * i), pnum, 999 ret = ubi_io_read_data(ubi, ubi->fm_buf + (ubi->leb_size * i),
1000 ubi->leb_start, ubi->leb_size); 1000 pnum, 0, ubi->leb_size);
1001 if (ret && ret != UBI_IO_BITFLIPS) { 1001 if (ret && ret != UBI_IO_BITFLIPS) {
1002 ubi_err(ubi, "unable to read fastmap block# %i (PEB: %i, " 1002 ubi_err(ubi, "unable to read fastmap block# %i (PEB: %i, "
1003 "err: %i)", i, pnum, ret); 1003 "err: %i)", i, pnum, ret);
@@ -1311,8 +1311,8 @@ static int ubi_write_fastmap(struct ubi_device *ubi,
1311 } 1311 }
1312 1312
1313 for (i = 0; i < new_fm->used_blocks; i++) { 1313 for (i = 0; i < new_fm->used_blocks; i++) {
1314 ret = ubi_io_write(ubi, fm_raw + (i * ubi->leb_size), 1314 ret = ubi_io_write_data(ubi, fm_raw + (i * ubi->leb_size),
1315 new_fm->e[i]->pnum, ubi->leb_start, ubi->leb_size); 1315 new_fm->e[i]->pnum, 0, ubi->leb_size);
1316 if (ret) { 1316 if (ret) {
1317 ubi_err(ubi, "unable to write fastmap to PEB %i!", 1317 ubi_err(ubi, "unable to write fastmap to PEB %i!",
1318 new_fm->e[i]->pnum); 1318 new_fm->e[i]->pnum);