mtd: mtd: drop NAND_ECC_SOFT_BCH enum value

This value should not be part of nand_ecc_modes_t as it specifies
algorithm not a mode. We successfully managed to introduce new "algo"
field which is respected now.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>

7 files changed, 5 insertions, 16 deletions

diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c
index 0f8c63f85f86..d4f454a4b35e 100644
--- a/drivers/mtd/nand/fsmc_nand.c
+++ b/drivers/mtd/nand/fsmc_nand.c
@@ -959,7 +959,6 @@ static int __init fsmc_nand_probe(struct platform_device *pdev)
                         break;
 
                 case NAND_ECC_SOFT:
-                case NAND_ECC_SOFT_BCH:
                         if (nand->ecc.algo == NAND_ECC_BCH) {
                                 dev_info(&pdev->dev, "Using 4-bit SW BCH ECC scheme\n");
                                 break;
@@ -974,7 +973,7 @@ static int __init fsmc_nand_probe(struct platform_device *pdev)
                  * Don't set layout for BCH4 SW ECC. This will be
                  * generated later in nand_bch_init() later.
                  */
-                if (nand->ecc.mode != NAND_ECC_SOFT_BCH) {
+                if (nand->ecc.mode == NAND_ECC_HW) {
                         switch (mtd->oobsize) {
                         case 16:
                         case 64:
diff --git a/drivers/mtd/nand/jz4780_nand.c b/drivers/mtd/nand/jz4780_nand.c
index 10f249ac148c..daf3c4217f4d 100644
--- a/drivers/mtd/nand/jz4780_nand.c
+++ b/drivers/mtd/nand/jz4780_nand.c
@@ -179,7 +179,6 @@ static int jz4780_nand_init_ecc(struct jz4780_nand_chip *nand, struct device *de
                 chip->ecc.correct = jz4780_nand_ecc_correct;
                 /* fall through */
         case NAND_ECC_SOFT:
-        case NAND_ECC_SOFT_BCH:
                 dev_info(dev, "using %s (strength %d, size %d, bytes %d)\n",
                         (nfc->bch) ? "hardware BCH" : "software ECC",
                         chip->ecc.strength, chip->ecc.size, chip->ecc.bytes);
diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
index aa0ba4b99395..5173fadc9a4e 100644
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
@@ -1625,7 +1625,6 @@ static int mxcnd_probe(struct platform_device *pdev)
                 break;
 
         case NAND_ECC_SOFT:
-        case NAND_ECC_SOFT_BCH:
                 break;
 
         default:
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 1d74b802aa0a..c9d6230eab08 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -4183,8 +4183,7 @@ static int nand_set_ecc_soft_ops(struct mtd_info *mtd)
         struct nand_chip *chip = mtd_to_nand(mtd);
         struct nand_ecc_ctrl *ecc = &chip->ecc;
 
-        if (WARN_ON(ecc->mode != NAND_ECC_SOFT &&
-                    ecc->mode != NAND_ECC_SOFT_BCH))
+        if (WARN_ON(ecc->mode != NAND_ECC_SOFT))
                 return -EINVAL;
 
         switch (ecc->algo) {
@@ -4331,8 +4330,7 @@ int nand_scan_tail(struct mtd_info *mtd)
          * If no default placement scheme is given, select an appropriate one.
          */
         if (!mtd->ooblayout &&
-            !((ecc->mode == NAND_ECC_SOFT || ecc->mode == NAND_ECC_SOFT_BCH) &&
-               ecc->algo == NAND_ECC_BCH)) {
+            !(ecc->mode == NAND_ECC_SOFT && ecc->algo == NAND_ECC_BCH)) {
                 switch (mtd->oobsize) {
                 case 8:
                 case 16:
@@ -4426,7 +4424,6 @@ int nand_scan_tail(struct mtd_info *mtd)
                 ecc->algo = NAND_ECC_HAMMING;
 
         case NAND_ECC_SOFT:
-        case NAND_ECC_SOFT_BCH:
                 ret = nand_set_ecc_soft_ops(mtd);
                 if (ret) {
                         ret = -EINVAL;
@@ -4514,7 +4511,6 @@ int nand_scan_tail(struct mtd_info *mtd)
         /* Large page NAND with SOFT_ECC should support subpage reads */
         switch (ecc->mode) {
         case NAND_ECC_SOFT:
-        case NAND_ECC_SOFT_BCH:
                 if (chip->page_shift > 9)
                         chip->options |= NAND_SUBPAGE_READ;
                 break;
@@ -4614,8 +4610,7 @@ void nand_release(struct mtd_info *mtd)
 {
         struct nand_chip *chip = mtd_to_nand(mtd);
 
-        if ((chip->ecc.mode == NAND_ECC_SOFT ||
-             chip->ecc.mode == NAND_ECC_SOFT_BCH) &&
+        if (chip->ecc.mode == NAND_ECC_SOFT &&
             chip->ecc.algo == NAND_ECC_BCH)
                 nand_bch_free((struct nand_bch_control *)chip->ecc.priv);
 
diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c
index 66eebb9e77f3..794745dff7f1 100644
--- a/drivers/mtd/nand/nandsim.c
+++ b/drivers/mtd/nand/nandsim.c
@@ -2339,7 +2339,7 @@ static int __init ns_init_module(void)
                         retval = -EINVAL;
                         goto error;
                 }
-                chip->ecc.mode = NAND_ECC_SOFT_BCH;
+                chip->ecc.mode = NAND_ECC_SOFT;
                 chip->ecc.algo = NAND_ECC_BCH;
                 chip->ecc.size = 512;
                 chip->ecc.strength = bch;
diff --git a/drivers/mtd/nand/sunxi_nand.c b/drivers/mtd/nand/sunxi_nand.c
index 1baf89836210..a83a690688b4 100644
--- a/drivers/mtd/nand/sunxi_nand.c
+++ b/drivers/mtd/nand/sunxi_nand.c
@@ -1612,8 +1612,6 @@ static int sunxi_nand_ecc_init(struct mtd_info *mtd, struct nand_ecc_ctrl *ecc,
                 return -EINVAL;
 
         switch (ecc->mode) {
-        case NAND_ECC_SOFT_BCH:
-                break;
         case NAND_ECC_HW:
                 ret = sunxi_nand_hw_ecc_ctrl_init(mtd, ecc, np);
                 if (ret)
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index e851839daf09..fbe8e164a4ee 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -116,7 +116,6 @@ typedef enum {
         NAND_ECC_HW,
         NAND_ECC_HW_SYNDROME,
         NAND_ECC_HW_OOB_FIRST,
-        NAND_ECC_SOFT_BCH,
 } nand_ecc_modes_t;
 
 enum nand_ecc_algo {