mtd: nand: refactor scanning code

A few pieces of code are unnecessarily duplicated. For easier
maintenance, we should fix this.

This should have no functional effect.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@intel.com>

1 files changed, 8 insertions, 20 deletions

diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c
index c488bcb84c9..cbf9b695c6f 100644
--- a/drivers/mtd/nand/nand_bbt.c
+++ b/drivers/mtd/nand/nand_bbt.c
@@ -306,28 +306,16 @@ static int scan_read_raw_oob(struct mtd_info *mtd, uint8_t *buf, loff_t offs,
         ops.ooboffs = 0;
         ops.ooblen = mtd->oobsize;
 
-
         while (len > 0) {
-                if (len <= mtd->writesize) {
-                        ops.oobbuf = buf + len;
-                        ops.datbuf = buf;
-                        ops.len = len;
-                        res = mtd->read_oob(mtd, offs, &ops);
-
-                        /* Ignore ECC errors when checking for BBM */
-                        if (res != -EUCLEAN && res != -EBADMSG)
-                                return res;
-                        return 0;
-                } else {
-                        ops.oobbuf = buf + mtd->writesize;
-                        ops.datbuf = buf;
-                        ops.len = mtd->writesize;
-                        res = mtd->read_oob(mtd, offs, &ops);
+                ops.datbuf = buf;
+                ops.len = min(len, (size_t)mtd->writesize);
+                ops.oobbuf = buf + ops.len;
 
-                        /* Ignore ECC errors when checking for BBM */
-                        if (res && res != -EUCLEAN && res != -EBADMSG)
-                                return res;
-                }
+                res = mtd->read_oob(mtd, offs, &ops);
+
+                /* Ignore ECC errors when checking for BBM */
+                if (res && res != -EUCLEAN && res != -EBADMSG)
+                        return res;
 
                 buf += mtd->oobsize + mtd->writesize;
                 len -= mtd->writesize;