Commit bb4a0986 authored by Artem Bityutskiy's avatar Artem Bityutskiy Committed by David Woodhouse

mtdoops: clean-up new MTD API usage

Let's remove useless 'mtd_can_have_bb()' function invocations.
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 79186876
...@@ -169,7 +169,7 @@ static void mtdoops_workfunc_erase(struct work_struct *work) ...@@ -169,7 +169,7 @@ static void mtdoops_workfunc_erase(struct work_struct *work)
cxt->nextpage = 0; cxt->nextpage = 0;
} }
while (mtd_can_have_bb(mtd)) { while (1) {
ret = mtd_block_isbad(mtd, cxt->nextpage * record_size); ret = mtd_block_isbad(mtd, cxt->nextpage * record_size);
if (!ret) if (!ret)
break; break;
...@@ -199,9 +199,9 @@ static void mtdoops_workfunc_erase(struct work_struct *work) ...@@ -199,9 +199,9 @@ static void mtdoops_workfunc_erase(struct work_struct *work)
return; return;
} }
if (mtd_can_have_bb(mtd) && ret == -EIO) { if (ret == -EIO) {
ret = mtd_block_markbad(mtd, cxt->nextpage * record_size); ret = mtd_block_markbad(mtd, cxt->nextpage * record_size);
if (ret < 0) { if (ret < 0 && ret != -EOPNOTSUPP) {
printk(KERN_ERR "mtdoops: block_markbad failed, aborting\n"); printk(KERN_ERR "mtdoops: block_markbad failed, aborting\n");
return; return;
} }
...@@ -257,8 +257,7 @@ static void find_next_position(struct mtdoops_context *cxt) ...@@ -257,8 +257,7 @@ static void find_next_position(struct mtdoops_context *cxt)
size_t retlen; size_t retlen;
for (page = 0; page < cxt->oops_pages; page++) { for (page = 0; page < cxt->oops_pages; page++) {
if (mtd_can_have_bb(mtd) && if (mtd_block_isbad(mtd, page * record_size))
mtd_block_isbad(mtd, page * record_size))
continue; continue;
/* Assume the page is used */ /* Assume the page is used */
mark_page_used(cxt, page); mark_page_used(cxt, page);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment