---

yaml
---
r: 242791
b: refs/heads/master
c: e21fa86
h: refs/heads/master
i:
  242789: b92ec3a
  242787: 67a2db7
  242783: 7ec18ca
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc2ff592b5b41f3f32e790dd124eeb3bc80706c8
+refs/heads/master: e21fa86ad0ffa2c292b104ea19bdaa46ceab7105

trunk/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"

trunk/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 @@ static int mtdswap_erase_block(struct mtdswap_dev *d, struct swap_eb *eb)
 
 	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);