mtdswap: kill strict error handling option

As Artem Bityutskiy suggested: this option is controversial, as we
do not really have any prove it is useful. And it is too much to have
it as a config parameter. So, better kill it and let the real mtdswap
users decide whether it is needed or not.

Signed-off-by: Yang Ruirui<ruirui.r.yang@tieto.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index 5fe01d55665728dfc7cb9724840b1dab0d0b9624..b4567c35a322c709f0d9a501fda63156950ad148 100644 (file)
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -335,14 +335,6 @@ config MTD_SWAP
          The driver provides wear leveling by storing erase counter into the
          OOB.
 
-config MTD_SWAP_STRICT
-       bool "Strict erase error handling"
-       depends on MTD_SWAP
-       help
-        Enables strict tolerance on failed erasures, marking erase blocks bad
-        right after the first failed operation. With non-strict mode the
-        erase operation is retried.
-
 source "drivers/mtd/chips/Kconfig"
 
 source "drivers/mtd/maps/Kconfig"

diff --git a/drivers/mtd/mtdswap.c b/drivers/mtd/mtdswap.c
index a65594fee4a377203fc71008576300bca8f8c254..dc4b136800b8cf0d8f15cc995cd7edd33a8e7753 100644 (file)
--- a/drivers/mtd/mtdswap.c
+++ b/drivers/mtd/mtdswap.c
@@ -156,12 +156,6 @@ struct mtdswap_oobdata {
 #define MTDSWAP_ERASE_RETRIES  3 /* Before marking erase block bad */
 #define MTDSWAP_IO_RETRIES     3
 
-#ifdef CONFIG_MTD_SWAP_STRICT
-#define MTDSWAP_STRICT         1
-#else
-#define MTDSWAP_STRICT         0
-#endif
-
 enum {
        MTDSWAP_SCANNED_CLEAN,
        MTDSWAP_SCANNED_DIRTY,
@@ -575,7 +569,7 @@ retry:
 
        ret = mtd->erase(mtd, &erase);
        if (ret) {
-               if (retries++ < MTDSWAP_ERASE_RETRIES && !MTDSWAP_STRICT) {
+               if (retries++ < MTDSWAP_ERASE_RETRIES) {
                        dev_warn(d->dev,
                                "erase of erase block %#llx on %s failed",
                                erase.addr, mtd->name);