16 files changed, 22 insertions, 22 deletions

diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c
index 78d551622e11..79a7ef276616 100644
--- a/drivers/mtd/nand/atmel_nand.c
+++ b/drivers/mtd/nand/atmel_nand.c
@@ -583,7 +583,7 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
 
         if (on_flash_bbt) {
                 printk(KERN_INFO "atmel_nand: Use On Flash BBT\n");
-                nand_chip->bbt_options |= NAND_USE_FLASH_BBT;
+                nand_chip->bbt_options |= NAND_BBT_USE_FLASH;
         }
 
         if (!cpu_has_dma())
diff --git a/drivers/mtd/nand/autcpu12.c b/drivers/mtd/nand/autcpu12.c
index adf934df8958..2e42ec2e8ff4 100644
--- a/drivers/mtd/nand/autcpu12.c
+++ b/drivers/mtd/nand/autcpu12.c
@@ -172,9 +172,9 @@ static int __init autcpu12_init(void)
 
         /* Enable the following for a flash based bad block table */
         /*
-           this->bbt_options = NAND_USE_FLASH_BBT;
+           this->bbt_options = NAND_BBT_USE_FLASH;
          */
-        this->bbt_options = NAND_USE_FLASH_BBT;
+        this->bbt_options = NAND_BBT_USE_FLASH;
 
         /* Scan to find existence of the device */
         if (nand_scan(autcpu12_mtd, 1)) {
diff --git a/drivers/mtd/nand/bcm_umi_nand.c b/drivers/mtd/nand/bcm_umi_nand.c
index 974d9bc8e48e..e3ffc4c908e4 100644
--- a/drivers/mtd/nand/bcm_umi_nand.c
+++ b/drivers/mtd/nand/bcm_umi_nand.c
@@ -474,7 +474,7 @@ static int __devinit bcm_umi_nand_probe(struct platform_device *pdev)
 
 #if NAND_ECC_BCH
         if (board_mtd->writesize > 512) {
-                if (this->bbt_options & NAND_USE_FLASH_BBT)
+                if (this->bbt_options & NAND_BBT_USE_FLASH)
                         largepage_bbt.options = NAND_BBT_SCAN2NDPAGE;
                 this->badblock_pattern = &largepage_bbt;
         }
diff --git a/drivers/mtd/nand/cafe_nand.c b/drivers/mtd/nand/cafe_nand.c
index 7dd7d844d2cf..d0eed498ed2b 100644
--- a/drivers/mtd/nand/cafe_nand.c
+++ b/drivers/mtd/nand/cafe_nand.c
@@ -686,7 +686,7 @@ static int __devinit cafe_nand_probe(struct pci_dev *pdev,
         cafe->nand.chip_delay = 0;
 
         /* Enable the following for a flash based bad block table */
-        cafe->nand.bbt_options = NAND_USE_FLASH_BBT;
+        cafe->nand.bbt_options = NAND_BBT_USE_FLASH;
         cafe->nand.options = NAND_NO_AUTOINCR | NAND_OWN_BUFFERS;
 
         if (skipbbt) {
diff --git a/drivers/mtd/nand/cs553x_nand.c b/drivers/mtd/nand/cs553x_nand.c
index 05adedd8c20c..b35496143e74 100644
--- a/drivers/mtd/nand/cs553x_nand.c
+++ b/drivers/mtd/nand/cs553x_nand.c
@@ -239,7 +239,7 @@ static int __init cs553x_init_one(int cs, int mmio, unsigned long adr)
         this->ecc.correct  = nand_correct_data;
 
         /* Enable the following for a flash based bad block table */
-        this->bbt_options = NAND_USE_FLASH_BBT;
+        this->bbt_options = NAND_BBT_USE_FLASH;
         this->options = NAND_NO_AUTOINCR;
 
         /* Scan to find existence of the device */
diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c
index 69f70195ff35..a4c82b4344ba 100644
--- a/drivers/mtd/nand/davinci_nand.c
+++ b/drivers/mtd/nand/davinci_nand.c
@@ -581,7 +581,7 @@ static int __init nand_davinci_probe(struct platform_device *pdev)
         info->chip.chip_delay   = 0;
         info->chip.select_chip  = nand_davinci_select_chip;
 
-        /* options such as NAND_USE_FLASH_BBT */
+        /* options such as NAND_BBT_USE_FLASH */
         info->chip.bbt_options  = pdata->bbt_options;
         /* options such as 16-bit widths */
         info->chip.options      = pdata->options;
diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
index dbb6fbae7d25..ee3014505af2 100644
--- a/drivers/mtd/nand/denali.c
+++ b/drivers/mtd/nand/denali.c
@@ -1577,7 +1577,7 @@ static int denali_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
         denali->nand.bbt_md = &bbt_mirror_descr;
 
         /* skip the scan for now until we have OOB read and write support */
-        denali->nand.bbt_options |= NAND_USE_FLASH_BBT;
+        denali->nand.bbt_options |= NAND_BBT_USE_FLASH;
         denali->nand.options |= NAND_SKIP_BBTSCAN;
         denali->nand.ecc.mode = NAND_ECC_HW_SYNDROME;
 
diff --git a/drivers/mtd/nand/diskonchip.c b/drivers/mtd/nand/diskonchip.c
index f70bc73e7948..b657d7f9b05c 100644
--- a/drivers/mtd/nand/diskonchip.c
+++ b/drivers/mtd/nand/diskonchip.c
@@ -1652,7 +1652,7 @@ static int __init doc_probe(unsigned long physadr)
         nand->ecc.mode          = NAND_ECC_HW_SYNDROME;
         nand->ecc.size          = 512;
         nand->ecc.bytes         = 6;
-        nand->bbt_options       = NAND_USE_FLASH_BBT;
+        nand->bbt_options       = NAND_BBT_USE_FLASH;
 
         doc->physadr            = physadr;
         doc->virtadr            = virtadr;
diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_elbc_nand.c
index bff4791d73c3..d4ea5fe013b7 100644
--- a/drivers/mtd/nand/fsl_elbc_nand.c
+++ b/drivers/mtd/nand/fsl_elbc_nand.c
@@ -792,7 +792,7 @@ static int fsl_elbc_chip_init(struct fsl_elbc_mtd *priv)
 
         /* set up nand options */
         chip->options = NAND_NO_READRDY | NAND_NO_AUTOINCR;
-        chip->bbt_options = NAND_USE_FLASH_BBT;
+        chip->bbt_options = NAND_BBT_USE_FLASH;
 
         chip->controller = &elbc_fcm_ctrl->controller;
         chip->priv = priv;
diff --git a/drivers/mtd/nand/mpc5121_nfc.c b/drivers/mtd/nand/mpc5121_nfc.c
index 0ac64b54bd67..2f2c35a7771e 100644
--- a/drivers/mtd/nand/mpc5121_nfc.c
+++ b/drivers/mtd/nand/mpc5121_nfc.c
@@ -736,7 +736,7 @@ static int __devinit mpc5121_nfc_probe(struct platform_device *op)
         chip->verify_buf = mpc5121_nfc_verify_buf;
         chip->select_chip = mpc5121_nfc_select_chip;
         chip->options = NAND_NO_AUTOINCR;
-        chip->bbt_options = NAND_USE_FLASH_BBT;
+        chip->bbt_options = NAND_BBT_USE_FLASH;
         chip->ecc.mode = NAND_ECC_SOFT;
 
         /* Support external chip-select logic on ADS5121 board */
diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
index ed68fde3d1be..ca42c8f335b3 100644
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
@@ -1179,7 +1179,7 @@ static int __init mxcnd_probe(struct platform_device *pdev)
                 this->bbt_td = &bbt_main_descr;
                 this->bbt_md = &bbt_mirror_descr;
                 /* update flash based bbt */
-                this->bbt_options |= NAND_USE_FLASH_BBT;
+                this->bbt_options |= NAND_BBT_USE_FLASH;
         }
 
         init_completion(&host->op_completion);
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index d39dffe71de4..422e7872d6db 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -405,7 +405,7 @@ static int nand_default_block_markbad(struct mtd_info *mtd, loff_t ofs)
                 chip->bbt[block >> 2] |= 0x01 << ((block & 0x03) << 1);
 
         /* Do we have a flash based bad block table ? */
-        if (chip->bbt_options & NAND_USE_FLASH_BBT)
+        if (chip->bbt_options & NAND_BBT_USE_FLASH)
                 ret = nand_update_bbt(mtd, ofs);
         else {
                 nand_get_device(chip, mtd, FL_WRITING);
diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c
index 66f93e2ac16b..dfea9fd1d61c 100644
--- a/drivers/mtd/nand/nand_bbt.c
+++ b/drivers/mtd/nand/nand_bbt.c
@@ -14,7 +14,7 @@
  *
  * When nand_scan_bbt is called, then it tries to find the bad block table
  * depending on the options in the BBT descriptor(s). If no flash based BBT
- * (NAND_USE_FLASH_BBT) is specified then the device is scanned for factory
+ * (NAND_BBT_USE_FLASH) is specified then the device is scanned for factory
  * marked good / bad blocks. This information is used to create a memory BBT.
  * Once a new bad block is discovered then the "factory" information is updated
  * on the device.
@@ -36,7 +36,7 @@
  * The table is marked in the OOB area with an ident pattern and a version
  * number which indicates which of both tables is more up to date. If the NAND
  * controller needs the complete OOB area for the ECC information then the
- * option NAND_BBT_NO_OOB should be used (along with NAND_USE_FLASH_BBT, of
+ * option NAND_BBT_NO_OOB should be used (along with NAND_BBT_USE_FLASH, of
  * course): it moves the ident pattern and the version byte into the data area
  * and the OOB area will remain untouched.
  *
@@ -1083,14 +1083,14 @@ static void verify_bbt_descr(struct mtd_info *mtd, struct nand_bbt_descr *bd)
         bits = bd->options & NAND_BBT_NRBITS_MSK;
 
         BUG_ON((this->bbt_options & NAND_BBT_NO_OOB) &&
-                        !(this->bbt_options & NAND_USE_FLASH_BBT));
+                        !(this->bbt_options & NAND_BBT_USE_FLASH));
         BUG_ON(!bits);
 
         if (bd->options & NAND_BBT_VERSION)
                 pattern_len++;
 
         if (bd->options & NAND_BBT_NO_OOB) {
-                BUG_ON(!(this->bbt_options & NAND_USE_FLASH_BBT));
+                BUG_ON(!(this->bbt_options & NAND_BBT_USE_FLASH));
                 BUG_ON(!(this->bbt_options & NAND_BBT_NO_OOB));
                 BUG_ON(bd->offs);
                 if (bd->options & NAND_BBT_VERSION)
@@ -1357,12 +1357,12 @@ int nand_default_bbt(struct mtd_info *mtd)
                         this->bbt_td = &bbt_main_descr;
                         this->bbt_md = &bbt_mirror_descr;
                 }
-                this->bbt_options |= NAND_USE_FLASH_BBT;
+                this->bbt_options |= NAND_BBT_USE_FLASH;
                 return nand_scan_bbt(mtd, &agand_flashbased);
         }
 
         /* Is a flash based bad block table requested ? */
-        if (this->bbt_options & NAND_USE_FLASH_BBT) {
+        if (this->bbt_options & NAND_BBT_USE_FLASH) {
                 /* Use the default pattern descriptors */
                 if (!this->bbt_td) {
                         if (this->bbt_options & NAND_BBT_NO_OOB) {
diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c
index 1856c42c62c4..34c03be77301 100644
--- a/drivers/mtd/nand/nandsim.c
+++ b/drivers/mtd/nand/nandsim.c
@@ -2275,7 +2275,7 @@ static int __init ns_init_module(void)
         case 2:
                  chip->bbt_options |= NAND_BBT_NO_OOB;
         case 1:
-                 chip->bbt_options |= NAND_USE_FLASH_BBT;
+                 chip->bbt_options |= NAND_BBT_USE_FLASH;
         case 0:
                 break;
         default:
diff --git a/drivers/mtd/nand/pasemi_nand.c b/drivers/mtd/nand/pasemi_nand.c
index 1c17f091e16b..a97264ececdb 100644
--- a/drivers/mtd/nand/pasemi_nand.c
+++ b/drivers/mtd/nand/pasemi_nand.c
@@ -156,7 +156,7 @@ static int __devinit pasemi_nand_probe(struct platform_device *ofdev)
 
         /* Enable the following for a flash based bad block table */
         chip->options = NAND_NO_AUTOINCR;
-        chip->bbt_options = NAND_USE_FLASH_BBT;
+        chip->bbt_options = NAND_BBT_USE_FLASH;
 
         /* Scan to find existence of the device */
         if (nand_scan(pasemi_nand_mtd, 1)) {
diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
index 370516c3f7c7..ec280798e221 100644
--- a/drivers/mtd/nand/s3c2410.c
+++ b/drivers/mtd/nand/s3c2410.c
@@ -881,7 +881,7 @@ static void s3c2410_nand_init_chip(struct s3c2410_nand_info *info,
          * let the kernel fish out the BBT from the NAND, and also skip the
          * full NAND scan that can take 1/2s or so. Little things... */
         if (set->flash_bbt) {
-                chip->bbt_options |= NAND_USE_FLASH_BBT;
+                chip->bbt_options |= NAND_BBT_USE_FLASH;
                 chip->options |= NAND_SKIP_BBTSCAN;
         }
 }