diff options
| author | Akinobu Mita <akinobu.mita@gmail.com> | 2013-08-15 22:55:09 +0900 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2013-08-30 21:36:06 +0100 |
| commit | 8a9f4aa3ac7560efcb242b3d1a31b1d804106f12 (patch) | |
| tree | ac105da51b1987e3b6894fb6b1bd73a6765c3ca3 /drivers/mtd/tests/pagetest.c | |
| parent | abc173ad84e50645f9136ea56afa9f86c98bf349 (diff) | |
mtd: tests: incorporate error message for mtdtest_write()
All callers of mtdtest_write() print the same error message on failure.
This incorporates the error message to mtdtest_write() and removes them
from the callers.
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd/tests/pagetest.c')
| -rw-r--r-- | drivers/mtd/tests/pagetest.c | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/drivers/mtd/tests/pagetest.c b/drivers/mtd/tests/pagetest.c index 9e8329c5d96..44b96e999ad 100644 --- a/drivers/mtd/tests/pagetest.c +++ b/drivers/mtd/tests/pagetest.c @@ -52,17 +52,11 @@ static struct rnd_state rnd_state; static int write_eraseblock(int ebnum) { - int err; loff_t addr = ebnum * mtd->erasesize; prandom_bytes_state(&rnd_state, writebuf, mtd->erasesize); cond_resched(); - err = mtdtest_write(mtd, addr, mtd->erasesize, writebuf); - if (err) - pr_err("error: write failed at %#llx\n", - (long long)addr); - - return err; + return mtdtest_write(mtd, addr, mtd->erasesize, writebuf); } static int verify_eraseblock(int ebnum) @@ -232,11 +226,8 @@ static int erasecrosstest(void) prandom_bytes_state(&rnd_state, writebuf, pgsize); strcpy(writebuf, "There is no data like this!"); err = mtdtest_write(mtd, addr0, pgsize, writebuf); - if (err) { - pr_info("error: write failed at %#llx\n", - (long long)addr0); + if (err) return err; - } pr_info("reading 1st page of block %d\n", ebnum); memset(readbuf, 0, pgsize); @@ -260,11 +251,8 @@ static int erasecrosstest(void) prandom_bytes_state(&rnd_state, writebuf, pgsize); strcpy(writebuf, "There is no data like this!"); err = mtdtest_write(mtd, addr0, pgsize, writebuf); - if (err) { - pr_err("error: write failed at %#llx\n", - (long long)addr0); + if (err) return err; - } pr_info("erasing block %d\n", ebnum2); err = mtdtest_erase_eraseblock(mtd, ebnum2); @@ -311,11 +299,8 @@ static int erasetest(void) pr_info("writing 1st page of block %d\n", ebnum); prandom_bytes_state(&rnd_state, writebuf, pgsize); err = mtdtest_write(mtd, addr0, pgsize, writebuf); - if (err) { - pr_err("error: write failed at %#llx\n", - (long long)addr0); + if (err) return err; - } pr_info("erasing block %d\n", ebnum); err = mtdtest_erase_eraseblock(mtd, ebnum); |