Skip to contentSkip to conversation

mtd: Annotate implicit fall through in nand_command/nand_command_lp

PATCH Applied Mathieu Malaterre 2 participants 4 messages Jan 16, 2019 – Jan 25, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 mtd: Annotate implicit fall through in nand_command/nand_command_lp

There is a plan to build the kernel with -Wimplicit-fallthrough and these places in the code produced warnings (W=1).

This commit removes the following warnings:

drivers/mtd/nand/raw/nand_legacy.c:332:6: warning: this statement may fall through [-Wimplicit-fallthrough=] drivers/mtd/nand/raw/nand_legacy.c:483:3: warning: this statement may fall through [-Wimplicit-fallthrough=]

---
 drivers/mtd/nand/raw/nand_legacy.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/mtd/nand/raw/nand_legacy.c +2 -1
index 43575943f13b..f2526ec616a6 100644
@@ -331,6 +331,7 @@ static void nand_command(struct nand_chip *chip, unsigned int command,
 		 */
 		if (column == -1 && page_addr == -1)
 			return;
+		/* fall through */
 
 	default:
 		/*
@@ -483,7 +484,7 @@ static void nand_command_lp(struct nand_chip *chip, unsigned int command,
 		chip->legacy.cmd_ctrl(chip, NAND_CMD_NONE,
 				      NAND_NCE | NAND_CTRL_CHANGE);
 
-		/* This applies to read commands */
+		/* fall through - This applies to read commands */
 	default:
 		/*
 		 * If we don't have access to the busy pin, we apply the given
Signature · 1 line
2.19.2
#1 lore raw

PATCH 2/2 mtd: Annotate implicit fall through in nand_scan_tail

There is a plan to build the kernel with -Wimplicit-fallthrough and these places in the code produced warnings (W=1).

This commit removes the following warnings:

drivers/mtd/nand/raw/nand_base.c:5556:6: warning: this statement may fall through [-Wimplicit-fallthrough=] drivers/mtd/nand/raw/nand_base.c:5575:6: warning: this statement may fall through [-Wimplicit-fallthrough=] drivers/mtd/nand/raw/nand_base.c:5613:13: warning: this statement may fall through [-Wimplicit-fallthrough=]

---
 drivers/mtd/nand/raw/nand_base.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/mtd/nand/raw/nand_base.c +3 -0
index cca4b24d2ffa..da344c276088 100644
@@ -5555,6 +5555,7 @@ static int nand_scan_tail(struct nand_chip *chip)
 		}
 		if (!ecc->read_page)
 			ecc->read_page = nand_read_page_hwecc_oob_first;
+		/* fall through */
 
 	case NAND_ECC_HW:
 		/* Use standard hwecc read page function? */
@@ -5574,6 +5575,7 @@ static int nand_scan_tail(struct nand_chip *chip)
 			ecc->read_subpage = nand_read_subpage;
 		if (!ecc->write_subpage && ecc->hwctl && ecc->calculate)
 			ecc->write_subpage = nand_write_subpage_hwecc;
+		/* fall through */
 
 	case NAND_ECC_HW_SYNDROME:
 		if ((!ecc->calculate || !ecc->correct || !ecc->hwctl) &&
@@ -5611,6 +5613,7 @@ static int nand_scan_tail(struct nand_chip *chip)
 			ecc->size, mtd->writesize);
 		ecc->mode = NAND_ECC_SOFT;
 		ecc->algo = NAND_ECC_HAMMING;
+		/* fall through */
 
 	case NAND_ECC_SOFT:
 		ret = nand_set_ecc_soft_ops(chip);
Signature · 1 line
2.19.2
maintainer Applied
#2 lore raw

Re: [PATCH 2/2] mtd: Annotate implicit fall through in nand_scan_tail

Hi Mathieu,

Mathieu Malaterre <[email protected]> wrote on Wed, 16 Jan 2019 20:50:04 +0100:

Quoted 35 lines

There is a plan to build the kernel with -Wimplicit-fallthrough and these places in the code produced warnings (W=1).

This commit removes the following warnings:

drivers/mtd/nand/raw/nand_base.c:5556:6: warning: this statement may fall through [-Wimplicit-fallthrough=] drivers/mtd/nand/raw/nand_base.c:5575:6: warning: this statement may fall through [-Wimplicit-fallthrough=] drivers/mtd/nand/raw/nand_base.c:5613:13: warning: this statement may fall through [-Wimplicit-fallthrough=]

---
 drivers/mtd/nand/raw/nand_base.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/mtd/nand/raw/nand_base.c +2 -0
index cca4b24d2ffa..da344c276088 100644
@@ -5555,6 +5555,7 @@ static int nand_scan_tail(struct nand_chip *chip)
 		}
 		if (!ecc->read_page)
 			ecc->read_page = nand_read_page_hwecc_oob_first;
+		/* fall through */
 
 	case NAND_ECC_HW:
 		/* Use standard hwecc read page function? */
@@ -5574,6 +5575,7 @@ static int nand_scan_tail(struct nand_chip *chip)
 			ecc->read_subpage = nand_read_subpage;
 		if (!ecc->write_subpage && ecc->hwctl && ecc->calculate)
 			ecc->write_subpage = nand_write_subpage_hwecc;
+		/* fall through */
 
 	case NAND_ECC_HW_SYNDROME:
 		if ((!ecc->calculate || !ecc->correct || !ecc->hwctl) &&

drivers/mtd/nand/raw/nand_base.c static int nand_scan_tail(struct nand_chip *chip) · line 5619

Quoted 7 lines
drivers/mtd/nand/raw/nand_base.c +1 -0
@@ -5611,6 +5613,7 @@ static int nand_scan_tail(struct nand_chip *chip)
 			ecc->size, mtd->writesize);
 		ecc->mode = NAND_ECC_SOFT;
 		ecc->algo = NAND_ECC_HAMMING;
+		/* fall through */
 
 	case NAND_ECC_SOFT:
 		ret = nand_set_ecc_soft_ops(chip);

Applied to nand/next with the subject prefix being "mtd: rawnand:"

Thanks,
Miquèl

maintainer Applied
#3 lore raw
In reply to Mathieu Malaterre

Hi Mathieu,

Mathieu Malaterre <[email protected]> wrote on Wed, 16 Jan 2019 20:50:03 +0100:

Quoted 26 lines

There is a plan to build the kernel with -Wimplicit-fallthrough and these places in the code produced warnings (W=1).

This commit removes the following warnings:

drivers/mtd/nand/raw/nand_legacy.c:332:6: warning: this statement may fall through [-Wimplicit-fallthrough=] drivers/mtd/nand/raw/nand_legacy.c:483:3: warning: this statement may fall through [-Wimplicit-fallthrough=]

---
 drivers/mtd/nand/raw/nand_legacy.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/mtd/nand/raw/nand_legacy.c +1 -0
index 43575943f13b..f2526ec616a6 100644
@@ -331,6 +331,7 @@ static void nand_command(struct nand_chip *chip, unsigned int command,
 		 */
 		if (column == -1 && page_addr == -1)
 			return;
+		/* fall through */
 
 	default:
 		/*

drivers/mtd/nand/raw/nand_legacy.c static void nand_command_lp(struct nand_chip *chip, unsigned int command, · line 490

Quoted 8 lines
drivers/mtd/nand/raw/nand_legacy.c +1 -1
@@ -483,7 +484,7 @@ static void nand_command_lp(struct nand_chip *chip, unsigned int command,
 		chip->legacy.cmd_ctrl(chip, NAND_CMD_NONE,
 				      NAND_NCE | NAND_CTRL_CHANGE);
 
-		/* This applies to read commands */
+		/* fall through - This applies to read commands */
 	default:
 		/*
 		 * If we don't have access to the busy pin, we apply the given

Applied to nand/next with the subject prefix being "mtd: rawnand:"

Thanks,
Miquèl