diff options
| author |   Brian Norris <computersforpeace@gmail.com> | 2012-05-11 13:30:33 -0700 |
|---|---|---|
| committer |   David Woodhouse <David.Woodhouse@intel.com> | 2012-07-06 18:17:02 +0100 |
| commit | 9cb93fbb5e84a2749e4ad6fec5091d149323a3d4 (patch) | |
| tree | 12f9cb3f3ee6afef065f4d4c3d6e8f7abe6ac95f /drivers/mtd/mtdoops.c | |
| parent | mtd: move mtd_read_oob() definition out of mtd.h (diff) | |
| download | linux-dev-9cb93fbb5e84a2749e4ad6fec5091d149323a3d4.tar.xz linux-dev-9cb93fbb5e84a2749e4ad6fec5091d149323a3d4.zip | |
mtd: mtdoops: refactor loop
We can clean up the loop logic a bit, here. This refactoring was enabled
in part by:
Commit bb4a09866 [mtdoops: clean-up new MTD API usage]
Signed-off-by: Brian Norris <computersforpeace@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/mtdoops.c')
| -rw-r--r-- | drivers/mtd/mtdoops.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/mtd/mtdoops.c b/drivers/mtd/mtdoops.c index ae36d7e1e913..6ba9507b7c84 100644 --- a/drivers/mtd/mtdoops.c +++ b/drivers/mtd/mtdoops.c @@ -169,14 +169,7 @@ static void mtdoops_workfunc_erase(struct work_struct *work) cxt->nextpage = 0; } - while (1) { - ret = mtd_block_isbad(mtd, cxt->nextpage * record_size); - if (!ret) - break; - if (ret < 0) { - printk(KERN_ERR "mtdoops: block_isbad failed, aborting\n"); - return; - } + while ((ret = mtd_block_isbad(mtd, cxt->nextpage * record_size)) > 0) { badblock: printk(KERN_WARNING "mtdoops: bad block at %08lx\n", cxt->nextpage * record_size); @@ -190,6 +183,11 @@ badblock: } } + if (ret < 0) { + printk(KERN_ERR "mtdoops: mtd_block_isbad failed, aborting\n"); + return; + } + for (j = 0, ret = -1; (j < 3) && (ret < 0); j++) ret = mtdoops_erase_block(cxt, cxt->nextpage * record_size); |