random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-11-03 21:48:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

nand: fix nand torture to use changed mtd api

Browse Source 
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>
This commit is contained in:
Max Krummenacher 2016-05-30 16:28:28 +02:00 committed by Scott Wood
parent ceee07b658
commit 667067faa1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/mtd/nand/nand_util.c
View File

@ -847,7 +847,7 @@ int nand_torture(struct mtd_info *mtd, loff_t offset)
} }
for (i = 0; i < patt_count; i++) { for (i = 0; i < patt_count; i++) {
err = mtd->erase(mtd, &instr); err = mtd_erase(mtd, &instr);
if (err) { if (err) {
printf("%s: erase() failed for block at 0x%llx: %d\n", printf("%s: erase() failed for block at 0x%llx: %d\n",
mtd->name, instr.addr, err); mtd->name, instr.addr, err);
@ -855,7 +855,7 @@ int nand_torture(struct mtd_info *mtd, loff_t offset)
} }
/* Make sure the block contains only 0xff bytes */ /* Make sure the block contains only 0xff bytes */
err = mtd->read(mtd, offset, mtd->erasesize, &retlen, buf); err = mtd_read(mtd, offset, mtd->erasesize, &retlen, buf);
if ((err && err != -EUCLEAN) || retlen != mtd->erasesize) { if ((err && err != -EUCLEAN) || retlen != mtd->erasesize) {
printf("%s: read() failed for block at 0x%llx: %d\n", printf("%s: read() failed for block at 0x%llx: %d\n",
mtd->name, instr.addr, err); mtd->name, instr.addr, err);
@ -872,14 +872,14 @@ int nand_torture(struct mtd_info *mtd, loff_t offset)
/* Write a pattern and check it */ /* Write a pattern and check it */
memset(buf, patterns[i], mtd->erasesize); memset(buf, patterns[i], mtd->erasesize);
err = mtd->write(mtd, offset, mtd->erasesize, &retlen, buf); err = mtd_write(mtd, offset, mtd->erasesize, &retlen, buf);
if (err || retlen != mtd->erasesize) { if (err || retlen != mtd->erasesize) {
printf("%s: write() failed for block at 0x%llx: %d\n", printf("%s: write() failed for block at 0x%llx: %d\n",
mtd->name, instr.addr, err); mtd->name, instr.addr, err);
goto out; goto out;
} }
err = mtd->read(mtd, offset, mtd->erasesize, &retlen, buf); err = mtd_read(mtd, offset, mtd->erasesize, &retlen, buf);
if ((err && err != -EUCLEAN) || retlen != mtd->erasesize) { if ((err && err != -EUCLEAN) || retlen != mtd->erasesize) {
printf("%s: read() failed for block at 0x%llx: %d\n", printf("%s: read() failed for block at 0x%llx: %d\n",
mtd->name, instr.addr, err); mtd->name, instr.addr, err);