2 files changed, 1 insertions, 15 deletions

diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index 5fe01d556657..b4567c35a322 100644
--- 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 a65594fee4a3..dc4b136800b8 100644
--- 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);