4 files changed, 26 insertions, 26 deletions

diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
index 5c0fe0dd705..071b63420f0 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
@@ -1104,7 +1104,7 @@ gpmi_ecc_write_oob(struct mtd_info *mtd, struct nand_chip *chip, int page)
          * The BCH will use all the (page + oob).
          * Our gpmi_hw_ecclayout can only prohibit the JFFS2 to write the oob.
          * But it can not stop some ioctls such MEMWRITEOOB which uses
-         * MTD_OOB_PLACE. So We have to implement this function to prohibit
+         * MTD_OPS_PLACE_OOB. So We have to implement this function to prohibit
          * these ioctls too.
          */
         return -EPERM;
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index ad40607f5f2..686b5577011 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -1382,12 +1382,12 @@ static uint8_t *nand_transfer_oob(struct nand_chip *chip, uint8_t *oob,
 {
         switch (ops->mode) {
 
-        case MTD_OOB_PLACE:
-        case MTD_OOB_RAW:
+        case MTD_OPS_PLACE_OOB:
+        case MTD_OPS_RAW:
                 memcpy(oob, chip->oob_poi + ops->ooboffs, len);
                 return oob + len;
 
-        case MTD_OOB_AUTO: {
+        case MTD_OPS_AUTO_OOB: {
                 struct nand_oobfree *free = chip->ecc.layout->oobfree;
                 uint32_t boffs = 0, roffs = ops->ooboffs;
                 size_t bytes = 0;
@@ -1437,7 +1437,7 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from,
         int ret = 0;
         uint32_t readlen = ops->len;
         uint32_t oobreadlen = ops->ooblen;
-        uint32_t max_oobsize = ops->mode == MTD_OOB_AUTO ?
+        uint32_t max_oobsize = ops->mode == MTD_OPS_AUTO_OOB ?
                 mtd->oobavail : mtd->oobsize;
 
         uint8_t *bufpoi, *oob, *buf;
@@ -1469,7 +1469,7 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from,
                         }
 
                         /* Now read the page into the buffer */
-                        if (unlikely(ops->mode == MTD_OOB_RAW))
+                        if (unlikely(ops->mode == MTD_OPS_RAW))
                                 ret = chip->ecc.read_page_raw(mtd, chip,
                                                               bufpoi, page);
                         else if (!aligned && NAND_SUBPAGE_READ(chip) && !oob)
@@ -1759,7 +1759,7 @@ static int nand_do_read_oob(struct mtd_info *mtd, loff_t from,
 
         stats = mtd->ecc_stats;
 
-        if (ops->mode == MTD_OOB_AUTO)
+        if (ops->mode == MTD_OPS_AUTO_OOB)
                 len = chip->ecc.layout->oobavail;
         else
                 len = mtd->oobsize;
@@ -1787,7 +1787,7 @@ static int nand_do_read_oob(struct mtd_info *mtd, loff_t from,
         page = realpage & chip->pagemask;
 
         while (1) {
-                if (ops->mode == MTD_OOB_RAW)
+                if (ops->mode == MTD_OPS_RAW)
                         sndcmd = chip->ecc.read_oob_raw(mtd, chip, page, sndcmd);
                 else
                         sndcmd = chip->ecc.read_oob(mtd, chip, page, sndcmd);
@@ -1865,9 +1865,9 @@ static int nand_read_oob(struct mtd_info *mtd, loff_t from,
         nand_get_device(chip, mtd, FL_READING);
 
         switch (ops->mode) {
-        case MTD_OOB_PLACE:
-        case MTD_OOB_AUTO:
-        case MTD_OOB_RAW:
+        case MTD_OPS_PLACE_OOB:
+        case MTD_OPS_AUTO_OOB:
+        case MTD_OPS_RAW:
                 break;
 
         default:
@@ -2113,12 +2113,12 @@ static uint8_t *nand_fill_oob(struct mtd_info *mtd, uint8_t *oob, size_t len,
 
         switch (ops->mode) {
 
-        case MTD_OOB_PLACE:
-        case MTD_OOB_RAW:
+        case MTD_OPS_PLACE_OOB:
+        case MTD_OPS_RAW:
                 memcpy(chip->oob_poi + ops->ooboffs, oob, len);
                 return oob + len;
 
-        case MTD_OOB_AUTO: {
+        case MTD_OPS_AUTO_OOB: {
                 struct nand_oobfree *free = chip->ecc.layout->oobfree;
                 uint32_t boffs = 0, woffs = ops->ooboffs;
                 size_t bytes = 0;
@@ -2167,7 +2167,7 @@ static int nand_do_write_ops(struct mtd_info *mtd, loff_t to,
         uint32_t writelen = ops->len;
 
         uint32_t oobwritelen = ops->ooblen;
-        uint32_t oobmaxlen = ops->mode == MTD_OOB_AUTO ?
+        uint32_t oobmaxlen = ops->mode == MTD_OPS_AUTO_OOB ?
                                 mtd->oobavail : mtd->oobsize;
 
         uint8_t *oob = ops->oobbuf;
@@ -2236,7 +2236,7 @@ static int nand_do_write_ops(struct mtd_info *mtd, loff_t to,
                 }
 
                 ret = chip->write_page(mtd, chip, wbuf, page, cached,
-                                       (ops->mode == MTD_OOB_RAW));
+                                       (ops->mode == MTD_OPS_RAW));
                 if (ret)
                         break;
 
@@ -2356,7 +2356,7 @@ static int nand_do_write_oob(struct mtd_info *mtd, loff_t to,
         pr_debug("%s: to = 0x%08x, len = %i\n",
                          __func__, (unsigned int)to, (int)ops->ooblen);
 
-        if (ops->mode == MTD_OOB_AUTO)
+        if (ops->mode == MTD_OPS_AUTO_OOB)
                 len = chip->ecc.layout->oobavail;
         else
                 len = mtd->oobsize;
@@ -2408,7 +2408,7 @@ static int nand_do_write_oob(struct mtd_info *mtd, loff_t to,
 
         nand_fill_oob(mtd, ops->oobbuf, ops->ooblen, ops);
 
-        if (ops->mode == MTD_OOB_RAW)
+        if (ops->mode == MTD_OPS_RAW)
                 status = chip->ecc.write_oob_raw(mtd, chip, page & chip->pagemask);
         else
                 status = chip->ecc.write_oob(mtd, chip, page & chip->pagemask);
@@ -2445,9 +2445,9 @@ static int nand_write_oob(struct mtd_info *mtd, loff_t to,
         nand_get_device(chip, mtd, FL_WRITING);
 
         switch (ops->mode) {
-        case MTD_OOB_PLACE:
-        case MTD_OOB_AUTO:
-        case MTD_OOB_RAW:
+        case MTD_OPS_PLACE_OOB:
+        case MTD_OPS_AUTO_OOB:
+        case MTD_OPS_RAW:
                 break;
 
         default:
diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c
index 6aa8125772b..c488bcb84c9 100644
--- a/drivers/mtd/nand/nand_bbt.c
+++ b/drivers/mtd/nand/nand_bbt.c
@@ -302,7 +302,7 @@ static int scan_read_raw_oob(struct mtd_info *mtd, uint8_t *buf, loff_t offs,
         struct mtd_oob_ops ops;
         int res;
 
-        ops.mode = MTD_OOB_RAW;
+        ops.mode = MTD_OPS_RAW;
         ops.ooboffs = 0;
         ops.ooblen = mtd->oobsize;
 
@@ -350,7 +350,7 @@ static int scan_write_bbt(struct mtd_info *mtd, loff_t offs, size_t len,
 {
         struct mtd_oob_ops ops;
 
-        ops.mode = MTD_OOB_PLACE;
+        ops.mode = MTD_OPS_PLACE_OOB;
         ops.ooboffs = 0;
         ops.ooblen = mtd->oobsize;
         ops.datbuf = buf;
@@ -433,7 +433,7 @@ static int scan_block_fast(struct mtd_info *mtd, struct nand_bbt_descr *bd,
         ops.oobbuf = buf;
         ops.ooboffs = 0;
         ops.datbuf = NULL;
-        ops.mode = MTD_OOB_PLACE;
+        ops.mode = MTD_OPS_PLACE_OOB;
 
         for (j = 0; j < len; j++) {
                 /*
@@ -672,7 +672,7 @@ static int write_bbt(struct mtd_info *mtd, uint8_t *buf,
         ops.ooblen = mtd->oobsize;
         ops.ooboffs = 0;
         ops.datbuf = NULL;
-        ops.mode = MTD_OOB_PLACE;
+        ops.mode = MTD_OPS_PLACE_OOB;
 
         if (!rcode)
                 rcode = 0xff;
diff --git a/drivers/mtd/nand/sm_common.c b/drivers/mtd/nand/sm_common.c
index b6332e83b28..2c438ef53cf 100644
--- a/drivers/mtd/nand/sm_common.c
+++ b/drivers/mtd/nand/sm_common.c
@@ -47,7 +47,7 @@ static int sm_block_markbad(struct mtd_info *mtd, loff_t ofs)
 
         /* As long as this function is called on erase block boundaries
                 it will work correctly for 256 byte nand */
-        ops.mode = MTD_OOB_PLACE;
+        ops.mode = MTD_OPS_PLACE_OOB;
         ops.ooboffs = 0;
         ops.ooblen = mtd->oobsize;
         ops.oobbuf = (void *)&oob;