[PATCH] mtd: spi-nor: remove unused NO_OP_CHIP_ERASE flag

[tkuw584924 at gmail.com]

From: Takahiro Kuwano <Takahiro.Kuwano at infineon.com>

NO_OP_CHIP_ERASE flag is no longer used.
Remove definition and references of the flag in core and debugfs.

Signed-off-by: Takahiro Kuwano <Takahiro.Kuwano at infineon.com>
---
 drivers/mtd/spi-nor/core.c    |  3 +--
 drivers/mtd/spi-nor/core.h    | 33 ++++++++++++++++-----------------
 drivers/mtd/spi-nor/debugfs.c |  7 ++-----
 3 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c
index e6c1fda61f57..278b3fd0996e 100644
--- a/drivers/mtd/spi-nor/core.c
+++ b/drivers/mtd/spi-nor/core.c
@@ -1787,8 +1787,7 @@ static int spi_nor_erase(struct mtd_info *mtd, struct erase_info *instr)
 		return ret;
 
 	/* chip (die) erase? */
-	if ((len == mtd->size && !(nor->flags & SNOR_F_NO_OP_CHIP_ERASE)) ||
-	    multi_die_erase) {
+	if (len == mtd->size || multi_die_erase) {
 		ret = spi_nor_erase_dice(nor, addr, len, die_size);
 		if (ret)
 			goto erase_err;
diff --git a/drivers/mtd/spi-nor/core.h b/drivers/mtd/spi-nor/core.h
index e838c40a2589..30b965ccb44c 100644
--- a/drivers/mtd/spi-nor/core.h
+++ b/drivers/mtd/spi-nor/core.h
@@ -124,23 +124,22 @@
 /* Keep these in sync with the list in debugfs.c */
 enum spi_nor_option_flags {
 	SNOR_F_HAS_SR_TB	= BIT(0),
-	SNOR_F_NO_OP_CHIP_ERASE	= BIT(1),
-	SNOR_F_BROKEN_RESET	= BIT(2),
-	SNOR_F_4B_OPCODES	= BIT(3),
-	SNOR_F_HAS_4BAIT	= BIT(4),
-	SNOR_F_HAS_LOCK		= BIT(5),
-	SNOR_F_HAS_16BIT_SR	= BIT(6),
-	SNOR_F_NO_READ_CR	= BIT(7),
-	SNOR_F_HAS_SR_TB_BIT6	= BIT(8),
-	SNOR_F_HAS_4BIT_BP      = BIT(9),
-	SNOR_F_HAS_SR_BP3_BIT6  = BIT(10),
-	SNOR_F_IO_MODE_EN_VOLATILE = BIT(11),
-	SNOR_F_SOFT_RESET	= BIT(12),
-	SNOR_F_SWP_IS_VOLATILE	= BIT(13),
-	SNOR_F_RWW		= BIT(14),
-	SNOR_F_ECC		= BIT(15),
-	SNOR_F_NO_WP		= BIT(16),
-	SNOR_F_SWAP16		= BIT(17),
+	SNOR_F_BROKEN_RESET	= BIT(1),
+	SNOR_F_4B_OPCODES	= BIT(2),
+	SNOR_F_HAS_4BAIT	= BIT(3),
+	SNOR_F_HAS_LOCK		= BIT(4),
+	SNOR_F_HAS_16BIT_SR	= BIT(5),
+	SNOR_F_NO_READ_CR	= BIT(6),
+	SNOR_F_HAS_SR_TB_BIT6	= BIT(7),
+	SNOR_F_HAS_4BIT_BP      = BIT(8),
+	SNOR_F_HAS_SR_BP3_BIT6  = BIT(9),
+	SNOR_F_IO_MODE_EN_VOLATILE = BIT(10),
+	SNOR_F_SOFT_RESET	= BIT(11),
+	SNOR_F_SWP_IS_VOLATILE	= BIT(12),
+	SNOR_F_RWW		= BIT(13),
+	SNOR_F_ECC		= BIT(14),
+	SNOR_F_NO_WP		= BIT(15),
+	SNOR_F_SWAP16		= BIT(16),
 };
 
 struct spi_nor_read_command {
diff --git a/drivers/mtd/spi-nor/debugfs.c b/drivers/mtd/spi-nor/debugfs.c
index fa6956144d2e..7505cbab75d6 100644
--- a/drivers/mtd/spi-nor/debugfs.c
+++ b/drivers/mtd/spi-nor/debugfs.c
@@ -12,7 +12,6 @@
 #define SNOR_F_NAME(name) [ilog2(SNOR_F_##name)] = #name
 static const char *const snor_f_names[] = {
 	SNOR_F_NAME(HAS_SR_TB),
-	SNOR_F_NAME(NO_OP_CHIP_ERASE),
 	SNOR_F_NAME(BROKEN_RESET),
 	SNOR_F_NAME(4B_OPCODES),
 	SNOR_F_NAME(HAS_4BAIT),
@@ -136,10 +135,8 @@ static int spi_nor_params_show(struct seq_file *s, void *data)
 		}
 	}
 
-	if (!(nor->flags & SNOR_F_NO_OP_CHIP_ERASE)) {
-		string_get_size(params->size, 1, STRING_UNITS_2, buf, sizeof(buf));
-		seq_printf(s, " %02x (%s)\n", nor->params->die_erase_opcode, buf);
-	}
+	string_get_size(params->size, 1, STRING_UNITS_2, buf, sizeof(buf));
+	seq_printf(s, " %02x (%s)\n", nor->params->die_erase_opcode, buf);
 
 	seq_puts(s, "\nsector map\n");
 	seq_puts(s, " region (in hex)   | erase mask | overlaid\n");
-- 
2.43.0