From mboxrd@z Thu Jan 1 00:00:00 1970 From: Steve Sakoman Date: Thu, 02 Sep 2010 08:33:31 -0700 Subject: [U-Boot] [PATCH V2 08/11] mtd: nand: supress 'unknown NAND' warning if no nand is found In-Reply-To: <20100901125550.4bea5be9@schlenkerla.am.freescale.net> References: <1283296887-8631-1-git-send-email-steve@sakoman.com> <1283296887-8631-9-git-send-email-steve@sakoman.com> <0554BEF07D437848AF01B9C9B5F0BC5DA8709970@dlee01.ent.ti.com> <20100901112618.069e4da2@schlenkerla.am.freescale.net> <1283359397.2011.104.camel@quadra> <20100901125550.4bea5be9@schlenkerla.am.freescale.net> Message-ID: <1283441611.2011.113.camel@quadra> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de This printk was added recently and results in ugly output on systems with no NAND: NAND: nand_get_flash_type: unknown NAND device: Manufacturer ID: 0x00, Chip ID: 0x00 0 MiB instead of: NAND: 0 MiB Signed-off-by: Steve Sakoman --- 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 ed1c9c9..b2400dd 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -2653,8 +2653,11 @@ static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, } if (!type) { - printk(KERN_INFO "%s: unknown NAND device: Manufacturer ID:" - " 0x%02x, Chip ID: 0x%02x\n", __func__, + /* supress warning if there is no nand */ + if ((*maf_id != 0x00) && (*maf_id != 0xff) && + (dev_id != 0x00) && (dev_id != 0xff)) + printk(KERN_INFO "%s: unknown NAND device: " + "Manufacturer ID: 0x%02x, Chip ID: 0x%02x\n", __func__, *maf_id, dev_id); return ERR_PTR(-ENODEV); } -- 1.7.0.4