mtd: rename MTD_OOB_* to MTD_OPS_*

These modes are not necessarily for OOB only. Particularly, MTD_OOB_RAW
affected operations on in-band page data as well. To clarify these
options and to emphasize that their effect is applied per-operation, we
change the primary prefix to MTD_OPS_.

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

2 files changed, 20 insertions, 20 deletions

diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index 493901a59e6e..a52aa0f6b0c3 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -1125,7 +1125,7 @@ static int onenand_mlc_read_ops_nolock(struct mtd_info *mtd, loff_t from,
         pr_debug("%s: from = 0x%08x, len = %i\n", __func__, (unsigned int)from,
                         (int)len);
 
-        if (ops->mode == MTD_OOB_AUTO)
+        if (ops->mode == MTD_OPS_AUTO_OOB)
                 oobsize = this->ecclayout->oobavail;
         else
                 oobsize = mtd->oobsize;
@@ -1170,7 +1170,7 @@ static int onenand_mlc_read_ops_nolock(struct mtd_info *mtd, loff_t from,
                         thisooblen = oobsize - oobcolumn;
                         thisooblen = min_t(int, thisooblen, ooblen - oobread);
 
-                        if (ops->mode == MTD_OOB_AUTO)
+                        if (ops->mode == MTD_OPS_AUTO_OOB)
                                 onenand_transfer_auto_oob(mtd, oobbuf, oobcolumn, thisooblen);
                         else
                                 this->read_bufferram(mtd, ONENAND_SPARERAM, oobbuf, oobcolumn, thisooblen);
@@ -1229,7 +1229,7 @@ static int onenand_read_ops_nolock(struct mtd_info *mtd, loff_t from,
         pr_debug("%s: from = 0x%08x, len = %i\n", __func__, (unsigned int)from,
                         (int)len);
 
-        if (ops->mode == MTD_OOB_AUTO)
+        if (ops->mode == MTD_OPS_AUTO_OOB)
                 oobsize = this->ecclayout->oobavail;
         else
                 oobsize = mtd->oobsize;
@@ -1291,7 +1291,7 @@ static int onenand_read_ops_nolock(struct mtd_info *mtd, loff_t from,
                         thisooblen = oobsize - oobcolumn;
                         thisooblen = min_t(int, thisooblen, ooblen - oobread);
 
-                        if (ops->mode == MTD_OOB_AUTO)
+                        if (ops->mode == MTD_OPS_AUTO_OOB)
                                 onenand_transfer_auto_oob(mtd, oobbuf, oobcolumn, thisooblen);
                         else
                                 this->read_bufferram(mtd, ONENAND_SPARERAM, oobbuf, oobcolumn, thisooblen);
@@ -1363,7 +1363,7 @@ static int onenand_read_oob_nolock(struct mtd_info *mtd, loff_t from,
         /* Initialize return length value */
         ops->oobretlen = 0;
 
-        if (mode == MTD_OOB_AUTO)
+        if (mode == MTD_OPS_AUTO_OOB)
                 oobsize = this->ecclayout->oobavail;
         else
                 oobsize = mtd->oobsize;
@@ -1409,7 +1409,7 @@ static int onenand_read_oob_nolock(struct mtd_info *mtd, loff_t from,
                         break;
                 }
 
-                if (mode == MTD_OOB_AUTO)
+                if (mode == MTD_OPS_AUTO_OOB)
                         onenand_transfer_auto_oob(mtd, buf, column, thislen);
                 else
                         this->read_bufferram(mtd, ONENAND_SPARERAM, buf, column, thislen);
@@ -1487,10 +1487,10 @@ static int onenand_read_oob(struct mtd_info *mtd, loff_t from,
         int ret;
 
         switch (ops->mode) {
-        case MTD_OOB_PLACE:
-        case MTD_OOB_AUTO:
+        case MTD_OPS_PLACE_OOB:
+        case MTD_OPS_AUTO_OOB:
                 break;
-        case MTD_OOB_RAW:
+        case MTD_OPS_RAW:
                 /* Not implemented yet */
         default:
                 return -EINVAL;
@@ -1908,7 +1908,7 @@ static int onenand_write_ops_nolock(struct mtd_info *mtd, loff_t to,
         if (!len)
                 return 0;
 
-        if (ops->mode == MTD_OOB_AUTO)
+        if (ops->mode == MTD_OPS_AUTO_OOB)
                 oobsize = this->ecclayout->oobavail;
         else
                 oobsize = mtd->oobsize;
@@ -1945,7 +1945,7 @@ static int onenand_write_ops_nolock(struct mtd_info *mtd, loff_t to,
                                 /* We send data to spare ram with oobsize
                                  * to prevent byte access */
                                 memset(oobbuf, 0xff, mtd->oobsize);
-                                if (ops->mode == MTD_OOB_AUTO)
+                                if (ops->mode == MTD_OPS_AUTO_OOB)
                                         onenand_fill_auto_oob(mtd, oobbuf, oob, oobcolumn, thisooblen);
                                 else
                                         memcpy(oobbuf + oobcolumn, oob, thisooblen);
@@ -2084,7 +2084,7 @@ static int onenand_write_oob_nolock(struct mtd_info *mtd, loff_t to,
         /* Initialize retlen, in case of early exit */
         ops->oobretlen = 0;
 
-        if (mode == MTD_OOB_AUTO)
+        if (mode == MTD_OPS_AUTO_OOB)
                 oobsize = this->ecclayout->oobavail;
         else
                 oobsize = mtd->oobsize;
@@ -2128,7 +2128,7 @@ static int onenand_write_oob_nolock(struct mtd_info *mtd, loff_t to,
                 /* We send data to spare ram with oobsize
                  * to prevent byte access */
                 memset(oobbuf, 0xff, mtd->oobsize);
-                if (mode == MTD_OOB_AUTO)
+                if (mode == MTD_OPS_AUTO_OOB)
                         onenand_fill_auto_oob(mtd, oobbuf, buf, column, thislen);
                 else
                         memcpy(oobbuf + column, buf, thislen);
@@ -2217,10 +2217,10 @@ static int onenand_write_oob(struct mtd_info *mtd, loff_t to,
         int ret;
 
         switch (ops->mode) {
-        case MTD_OOB_PLACE:
-        case MTD_OOB_AUTO:
+        case MTD_OPS_PLACE_OOB:
+        case MTD_OPS_AUTO_OOB:
                 break;
-        case MTD_OOB_RAW:
+        case MTD_OPS_RAW:
                 /* Not implemented yet */
         default:
                 return -EINVAL;
@@ -2603,7 +2603,7 @@ static int onenand_default_block_markbad(struct mtd_info *mtd, loff_t ofs)
         struct bbm_info *bbm = this->bbm;
         u_char buf[2] = {0, 0};
         struct mtd_oob_ops ops = {
-                .mode = MTD_OOB_PLACE,
+                .mode = MTD_OPS_PLACE_OOB,
                 .ooblen = 2,
                 .oobbuf = buf,
                 .ooboffs = 0,
@@ -3171,7 +3171,7 @@ static int do_otp_lock(struct mtd_info *mtd, loff_t from, size_t len,
                 this->command(mtd, ONENAND_CMD_RESET, 0, 0);
                 this->wait(mtd, FL_RESETING);
         } else {
-                ops.mode = MTD_OOB_PLACE;
+                ops.mode = MTD_OPS_PLACE_OOB;
                 ops.ooblen = len;
                 ops.oobbuf = buf;
                 ops.ooboffs = 0;
@@ -3677,7 +3677,7 @@ static int flexonenand_check_blocks_erased(struct mtd_info *mtd, int start, int
         int i, ret;
         int block;
         struct mtd_oob_ops ops = {
-                .mode = MTD_OOB_PLACE,
+                .mode = MTD_OPS_PLACE_OOB,
                 .ooboffs = 0,
                 .ooblen = mtd->oobsize,
                 .datbuf = NULL,
diff --git a/drivers/mtd/onenand/onenand_bbt.c b/drivers/mtd/onenand/onenand_bbt.c
index 3b9a2a9573c6..09956c4fd850 100644
--- a/drivers/mtd/onenand/onenand_bbt.c
+++ b/drivers/mtd/onenand/onenand_bbt.c
@@ -80,7 +80,7 @@ static int create_bbt(struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr
         startblock = 0;
         from = 0;
 
-        ops.mode = MTD_OOB_PLACE;
+        ops.mode = MTD_OPS_PLACE_OOB;
         ops.ooblen = readlen;
         ops.oobbuf = buf;
         ops.len = ops.ooboffs = ops.retlen = ops.oobretlen = 0;