From: Akinobu Mita <akinobu.mita@gmail.com>
Date: Sat, 27 Jul 2013 14:09:53 +0000 (+0900)
Subject: mtd: denali: use NAND_CI_CELLTYPE_MSK instead of hardcoded constant
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=07cc0fbadb8bfcbba57c9035beece608ceee0bd3;p=openwrt%2Fstaging%2Fblogic.git

mtd: denali: use NAND_CI_CELLTYPE_MSK instead of hardcoded constant

Use NAND_CI_CELLTYPE_MSK to extract the cell type from nand_chip.cellinfo
instead of hardcoded constant.

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Artem Bityutskiy <dedekind1@gmail.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
---

diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
index 0c8bb6bf8424..2ed2bb33a6e7 100644
--- a/drivers/mtd/nand/denali.c
+++ b/drivers/mtd/nand/denali.c
@@ -1520,7 +1520,7 @@ int denali_init(struct denali_nand_info *denali)
 	 * so just let controller do 15bit ECC for MLC and 8bit ECC for
 	 * SLC if possible.
 	 * */
-	if (denali->nand.cellinfo & 0xc &&
+	if (denali->nand.cellinfo & NAND_CI_CELLTYPE_MSK &&
 			(denali->mtd.oobsize > (denali->bbtskipbytes +
 			ECC_15BITS * (denali->mtd.writesize /
 			ECC_SECTOR_SIZE)))) {