Commit 0760e818 authored by Nicholas Mc Guire's avatar Nicholas Mc Guire Committed by Brian Norris

mtd: nand: omap: drop condition with no effect

The if and the else branch code are identical - so the condition has no
effect on the effective code. This patch removes the condition and the
duplicated code and updates the documentation as suggested by
Roger Quadros <rogerq@ti.com>.
Acked-by: default avatarRoger Quadros <rogerq@ti.com>
Signed-off-by: default avatarNicholas Mc Guire <hofrat@osadl.org>
Reviewed-by: default avatarPekon Gupta <pekon@pek-sem.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent cd145af9
...@@ -1048,10 +1048,9 @@ static int omap_dev_ready(struct mtd_info *mtd) ...@@ -1048,10 +1048,9 @@ static int omap_dev_ready(struct mtd_info *mtd)
* @mtd: MTD device structure * @mtd: MTD device structure
* @mode: Read/Write mode * @mode: Read/Write mode
* *
* When using BCH, sector size is hardcoded to 512 bytes. * When using BCH with SW correction (i.e. no ELM), sector size is set
* Using wrapping mode 6 both for reading and writing if ELM module not uses * to 512 bytes and we use BCH_WRAPMODE_6 wrapping mode
* for error correction. * for both reading and writing with:
* On writing,
* eccsize0 = 0 (no additional protected byte in spare area) * eccsize0 = 0 (no additional protected byte in spare area)
* eccsize1 = 32 (skip 32 nibbles = 16 bytes per sector in spare area) * eccsize1 = 32 (skip 32 nibbles = 16 bytes per sector in spare area)
*/ */
...@@ -1071,15 +1070,9 @@ static void __maybe_unused omap_enable_hwecc_bch(struct mtd_info *mtd, int mode) ...@@ -1071,15 +1070,9 @@ static void __maybe_unused omap_enable_hwecc_bch(struct mtd_info *mtd, int mode)
case OMAP_ECC_BCH4_CODE_HW_DETECTION_SW: case OMAP_ECC_BCH4_CODE_HW_DETECTION_SW:
bch_type = 0; bch_type = 0;
nsectors = 1; nsectors = 1;
if (mode == NAND_ECC_READ) { wr_mode = BCH_WRAPMODE_6;
wr_mode = BCH_WRAPMODE_6; ecc_size0 = BCH_ECC_SIZE0;
ecc_size0 = BCH_ECC_SIZE0; ecc_size1 = BCH_ECC_SIZE1;
ecc_size1 = BCH_ECC_SIZE1;
} else {
wr_mode = BCH_WRAPMODE_6;
ecc_size0 = BCH_ECC_SIZE0;
ecc_size1 = BCH_ECC_SIZE1;
}
break; break;
case OMAP_ECC_BCH4_CODE_HW: case OMAP_ECC_BCH4_CODE_HW:
bch_type = 0; bch_type = 0;
...@@ -1097,15 +1090,9 @@ static void __maybe_unused omap_enable_hwecc_bch(struct mtd_info *mtd, int mode) ...@@ -1097,15 +1090,9 @@ static void __maybe_unused omap_enable_hwecc_bch(struct mtd_info *mtd, int mode)
case OMAP_ECC_BCH8_CODE_HW_DETECTION_SW: case OMAP_ECC_BCH8_CODE_HW_DETECTION_SW:
bch_type = 1; bch_type = 1;
nsectors = 1; nsectors = 1;
if (mode == NAND_ECC_READ) { wr_mode = BCH_WRAPMODE_6;
wr_mode = BCH_WRAPMODE_6; ecc_size0 = BCH_ECC_SIZE0;
ecc_size0 = BCH_ECC_SIZE0; ecc_size1 = BCH_ECC_SIZE1;
ecc_size1 = BCH_ECC_SIZE1;
} else {
wr_mode = BCH_WRAPMODE_6;
ecc_size0 = BCH_ECC_SIZE0;
ecc_size1 = BCH_ECC_SIZE1;
}
break; break;
case OMAP_ECC_BCH8_CODE_HW: case OMAP_ECC_BCH8_CODE_HW:
bch_type = 1; bch_type = 1;
......
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