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>
err = mtd_write(mtd, addr, size, &written, buf);
if (!err && written != size)
err = -EIO;
err = mtd_write(mtd, addr, size, &written, buf);
if (!err && written != size)
err = -EIO;
+ if (err)
+ pr_err("error: write failed at %#llx\n", addr);
/* Writes wbuffer to page */
static int write_page(int log)
{
/* Writes wbuffer to page */
static int write_page(int log)
{
if (log)
pr_info("write_page\n");
if (log)
pr_info("write_page\n");
- err = mtdtest_write(mtd, offset, mtd->writesize, wbuffer);
- if (err)
- pr_err("error: write failed at %#llx\n", (long long)offset);
-
- return err;
+ return mtdtest_write(mtd, offset, mtd->writesize, wbuffer);
}
/* Re-writes the data area while leaving the OOB alone. */
}
/* Re-writes the data area while leaving the OOB alone. */
static int write_eraseblock(int ebnum)
{
static int write_eraseblock(int ebnum)
{
loff_t addr = ebnum * mtd->erasesize;
prandom_bytes_state(&rnd_state, writebuf, mtd->erasesize);
cond_resched();
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)
}
static int verify_eraseblock(int ebnum)
prandom_bytes_state(&rnd_state, writebuf, pgsize);
strcpy(writebuf, "There is no data like this!");
err = mtdtest_write(mtd, addr0, pgsize, writebuf);
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);
pr_info("reading 1st page of block %d\n", ebnum);
memset(readbuf, 0, pgsize);
pr_info("reading 1st page of block %d\n", ebnum);
memset(readbuf, 0, pgsize);
prandom_bytes_state(&rnd_state, writebuf, pgsize);
strcpy(writebuf, "There is no data like this!");
err = mtdtest_write(mtd, addr0, pgsize, writebuf);
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);
pr_info("erasing block %d\n", ebnum2);
err = mtdtest_erase_eraseblock(mtd, ebnum2);
pr_info("erasing block %d\n", ebnum2);
err = mtdtest_erase_eraseblock(mtd, ebnum2);
pr_info("writing 1st page of block %d\n", ebnum);
prandom_bytes_state(&rnd_state, writebuf, pgsize);
err = mtdtest_write(mtd, addr0, pgsize, writebuf);
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);
pr_info("erasing block %d\n", ebnum);
err = mtdtest_erase_eraseblock(mtd, ebnum);
pr_info("erasing block %d\n", ebnum);
err = mtdtest_erase_eraseblock(mtd, ebnum);
static int write_eraseblock(int ebnum)
{
static int write_eraseblock(int ebnum)
{
loff_t addr = ebnum * mtd->erasesize;
loff_t addr = ebnum * mtd->erasesize;
- err = mtdtest_write(mtd, addr, mtd->erasesize, iobuf);
- if (err)
- pr_err("error: write failed at %#llx\n", addr);
-
- return err;
+ return mtdtest_write(mtd, addr, mtd->erasesize, iobuf);
}
static int write_eraseblock_by_page(int ebnum)
}
static int write_eraseblock_by_page(int ebnum)
for (i = 0; i < pgcnt; i++) {
err = mtdtest_write(mtd, addr, pgsize, buf);
for (i = 0; i < pgcnt; i++) {
err = mtdtest_write(mtd, addr, pgsize, buf);
- if (err) {
- pr_err("error: write failed at %#llx\n",
- addr);
addr += pgsize;
buf += pgsize;
}
addr += pgsize;
buf += pgsize;
}
for (i = 0; i < n; i++) {
err = mtdtest_write(mtd, addr, sz, buf);
for (i = 0; i < n; i++) {
err = mtdtest_write(mtd, addr, sz, buf);
- if (err) {
- pr_err("error: write failed at %#llx\n",
- addr);
err = mtdtest_write(mtd, addr, pgsize, buf);
err = mtdtest_write(mtd, addr, pgsize, buf);
- if (err) {
- pr_err("error: write failed at %#llx\n",
- addr);
- }
- }
}
addr = eb * mtd->erasesize + offs;
err = mtdtest_write(mtd, addr, len, writebuf);
}
addr = eb * mtd->erasesize + offs;
err = mtdtest_write(mtd, addr, len, writebuf);
- if (unlikely(err)) {
- pr_err("error: write failed at 0x%llx\n",
- (long long)addr);
offs += len;
while (offs > mtd->erasesize) {
offsets[eb++] = mtd->erasesize;
offs += len;
while (offs > mtd->erasesize) {
offsets[eb++] = mtd->erasesize;