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>

1 files changed, 1 insertions, 7 deletions

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);