This reverts commit d1fe68f1b010b83ddd3559ffbfcb70dca68b2563
and ec3b8c646bdc8c2ea0a78923ccb745012eabc097 (as a fixup).
The message "CONFIG_NAND_NEED_ECC_PLACEMENT_INTERLEAVED is disabled"
is always issued, regardless of the MTD ECC layout used, since it
is executed through "fallthrough" from the previous case statement.
Additionally, if !IS_ENABLED(CONFIG_NAND_NEED_ECC_PLACEMENT_INTERLEAVED)
is triggered, the patch calls break, which disables the additional checks.
Signed-off-by: Alexander Shiyan <eagle.alexander923@xxxxxxxxx>
---
drivers/mtd/nand/raw/Kconfig | 4 ----
drivers/mtd/nand/raw/nand_base.c | 4 ----
2 files changed, 8 deletions(-)
diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig
index b6c6e62731..e9d1b83706 100644
--- a/drivers/mtd/nand/raw/Kconfig
+++ b/drivers/mtd/nand/raw/Kconfig
@@ -35,9 +35,6 @@ config NAND_ALLOW_ERASE_BAD
config NAND_NEED_EXEC_OP
bool
-config NAND_NEED_ECC_PLACEMENT_INTERLEAVED
- bool
-
comment "Raw/parallel NAND flash controllers"
config NAND_IMX
@@ -159,7 +156,6 @@ config MTD_NAND_DENALI
tristate "Support Denali NAND controller"
depends on HAS_DMA
select NAND_NEED_EXEC_OP
- select NAND_NEED_ECC_PLACEMENT_INTERLEAVED
help
Enable support for the Denali NAND controller. This should be
combined with either the PCI or platform drivers to provide device
diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c
index b6bef46499..9769725026 100644
--- a/drivers/mtd/nand/raw/nand_base.c
+++ b/drivers/mtd/nand/raw/nand_base.c
@@ -5671,10 +5671,6 @@ static int nand_set_ecc_on_host_ops(struct nand_chip *chip)
fallthrough;
case NAND_ECC_PLACEMENT_INTERLEAVED:
- if (!IS_ENABLED(CONFIG_NAND_NEED_ECC_PLACEMENT_INTERLEAVED)) {
- WARN(1, "CONFIG_NAND_NEED_ECC_PLACEMENT_INTERLEAVED is disabled\n");
- break;
- }
if ((!ecc->calculate || !ecc->correct || !ecc->hwctl) &&
(!ecc->read_page ||
ecc->read_page == nand_read_page_hwecc ||
--
2.38.2
