Commit e21fa86a authored by Yang Ruirui's avatar Yang Ruirui Committed by Artem Bityutskiy

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: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
parent fc2ff592
...@@ -335,14 +335,6 @@ config MTD_SWAP ...@@ -335,14 +335,6 @@ config MTD_SWAP
The driver provides wear leveling by storing erase counter into the The driver provides wear leveling by storing erase counter into the
OOB. 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/chips/Kconfig"
source "drivers/mtd/maps/Kconfig" source "drivers/mtd/maps/Kconfig"
......
...@@ -156,12 +156,6 @@ struct mtdswap_oobdata { ...@@ -156,12 +156,6 @@ struct mtdswap_oobdata {
#define MTDSWAP_ERASE_RETRIES 3 /* Before marking erase block bad */ #define MTDSWAP_ERASE_RETRIES 3 /* Before marking erase block bad */
#define MTDSWAP_IO_RETRIES 3 #define MTDSWAP_IO_RETRIES 3
#ifdef CONFIG_MTD_SWAP_STRICT
#define MTDSWAP_STRICT 1
#else
#define MTDSWAP_STRICT 0
#endif
enum { enum {
MTDSWAP_SCANNED_CLEAN, MTDSWAP_SCANNED_CLEAN,
MTDSWAP_SCANNED_DIRTY, MTDSWAP_SCANNED_DIRTY,
...@@ -575,7 +569,7 @@ static int mtdswap_erase_block(struct mtdswap_dev *d, struct swap_eb *eb) ...@@ -575,7 +569,7 @@ static int mtdswap_erase_block(struct mtdswap_dev *d, struct swap_eb *eb)
ret = mtd->erase(mtd, &erase); ret = mtd->erase(mtd, &erase);
if (ret) { if (ret) {
if (retries++ < MTDSWAP_ERASE_RETRIES && !MTDSWAP_STRICT) { if (retries++ < MTDSWAP_ERASE_RETRIES) {
dev_warn(d->dev, dev_warn(d->dev,
"erase of erase block %#llx on %s failed", "erase of erase block %#llx on %s failed",
erase.addr, mtd->name); erase.addr, mtd->name);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment