diff options
| author | Max Krummenacher <max.oss.09@gmail.com> | 2016-05-30 16:28:28 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2016-09-29 06:03:15 +0200 |
| commit | fd714a5cdeb8e13cbe66d2dfe262a738c8940ff8 (patch) | |
| tree | 58cff9dcd9aa4b0da8119ade3036edaff17063e3 | |
| parent | 90df73be68d1a0660975da2fdf05af2270456be8 (diff) | |
nand: fix nand torture to use changed mtd api
The mtd subsystem deprecated and renamed the direct use of the mtd_info
struct's functionpointers. Instead the corresponding mtd_xxx function
should be used.
See also:
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=3c3c10bba1e4ccb75b41442e45c1a072f6cded19
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
(cherry picked from commit 667067faa18334f1e28c01b47530b5cce1b6182f)
| -rw-r--r-- | drivers/mtd/nand/nand_util.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mtd/nand/nand_util.c b/drivers/mtd/nand/nand_util.c index 395ba2d96a..56a69cac66 100644 --- a/drivers/mtd/nand/nand_util.c +++ b/drivers/mtd/nand/nand_util.c @@ -846,7 +846,7 @@ int nand_torture(nand_info_t *nand, loff_t offset) } for (i = 0; i < patt_count; i++) { - err = nand->erase(nand, &instr); + err = mtd_erase(nand, &instr); if (err) { printf("%s: erase() failed for block at 0x%llx: %d\n", nand->name, instr.addr, err); @@ -854,7 +854,7 @@ int nand_torture(nand_info_t *nand, loff_t offset) } /* Make sure the block contains only 0xff bytes */ - err = nand->read(nand, offset, nand->erasesize, &retlen, buf); + err = mtd_read(nand, offset, nand->erasesize, &retlen, buf); if ((err && err != -EUCLEAN) || retlen != nand->erasesize) { printf("%s: read() failed for block at 0x%llx: %d\n", nand->name, instr.addr, err); @@ -871,14 +871,14 @@ int nand_torture(nand_info_t *nand, loff_t offset) /* Write a pattern and check it */ memset(buf, patterns[i], nand->erasesize); - err = nand->write(nand, offset, nand->erasesize, &retlen, buf); + err = mtd_write(nand, offset, nand->erasesize, &retlen, buf); if (err || retlen != nand->erasesize) { printf("%s: write() failed for block at 0x%llx: %d\n", nand->name, instr.addr, err); goto out; } - err = nand->read(nand, offset, nand->erasesize, &retlen, buf); + err = mtd_read(nand, offset, nand->erasesize, &retlen, buf); if ((err && err != -EUCLEAN) || retlen != nand->erasesize) { printf("%s: read() failed for block at 0x%llx: %d\n", nand->name, instr.addr, err); |