mtd: nand: onfi don't WARN if we are in 16 bits mode

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=0ce82b7f7b7373b16ecf7b5725e21e2975204500
Commit:     0ce82b7f7b7373b16ecf7b5725e21e2975204500
Parent:     7dfe4be351e81656ca1068e5d4ead235c7ba94b1
Author:     Matthieu CASTET <matthieu.castet at parrot.com>
AuthorDate: Wed Jan 16 15:25:45 2013 +0100
Committer:  David Woodhouse <David.Woodhouse at intel.com>
CommitDate: Sat Jan 19 09:58:33 2013 +0000

    mtd: nand: onfi don't WARN if we are in 16 bits mode
    
    Commit ff3206b2450499203532af2505a7f6f8413e92c0 ('mtd: nand: onfi need
    to be probed in 8 bits mode') adds a WARN if the onfi probe is in 16
    bits mode. This allows to detect driver that need to be fixed, but this
    is a bit noisy¹. Transform the WARN in a pr_err.
    
    ¹ http://article.gmane.org/gmane.linux.ports.arm.omap/91317
    
    Signed-off-by: Matthieu CASTET <matthieu.castet at parrot.com>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
---
 drivers/mtd/nand/nand_base.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 8323ac9..3766682 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -2857,8 +2857,11 @@ static int nand_flash_detect_onfi(struct mtd_info *mtd, struct nand_chip *chip,
 	int i;
 	int val;
 
-	/* ONFI need to be probed in 8 bits mode */
-	WARN_ON(chip->options & NAND_BUSWIDTH_16);
+	/* ONFI need to be probed in 8 bits mode, and 16 bits should be selected with NAND_BUSWIDTH_AUTO */
+	if (chip->options & NAND_BUSWIDTH_16) {
+		pr_err("Trying ONFI probe in 16 bits mode, aborting !\n");
+		return 0;
+	}
 	/* Try ONFI for unknown chip or LP */
 	chip->cmdfunc(mtd, NAND_CMD_READID, 0x20, -1);
 	if (chip->read_byte(mtd) != 'O' || chip->read_byte(mtd) != 'N' ||