Patchwork [1/3] mtdoops: refactor loop

login
register
mail settings
Submitter Brian Norris
Date May 11, 2012, 8:30 p.m.
Message ID <1336768235-12658-1-git-send-email-computersforpeace@gmail.com>
Download mbox | patch
Permalink /patch/158591/
State Accepted
Commit 9cb93fbb5e84a2749e4ad6fec5091d149323a3d4
Headers show

Comments

Brian Norris - May 11, 2012, 8:30 p.m.
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>
---
 drivers/mtd/mtdoops.c |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)
Artem Bityutskiy - May 15, 2012, 7:58 a.m.
On Fri, 2012-05-11 at 13:30 -0700, Brian Norris wrote:
> 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>

Pushed all 3 to l2-mtd.git, thanks!

Patch

diff --git a/drivers/mtd/mtdoops.c b/drivers/mtd/mtdoops.c
index ae36d7e..6ba9507 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);