xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mtd: tests: incorporate error message for mtdtest_write()

Browse Source 
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>
This commit is contained in:
Akinobu Mita
2013-08-15 22:55:09 +09:00
committed by David Woodhouse
parent abc173ad84
commit 8a9f4aa3ac
5 changed files with 12 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/mtd/tests/pagetest.c
View File

@@ -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);