From patchwork Tue Aug 31 23:21:24 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [U-Boot, 08/11] mtd: nand: honor CONFIG_SYS_NAND_QUIET_TEST with unknown NAND printk Date: Tue, 31 Aug 2010 13:21:24 -0000 From: Steve Sakoman X-Patchwork-Id: 71836 Message-Id: <1283296887-8631-9-git-send-email-steve@sakoman.com> To: u-boot@lists.denx.de Cc: Steve Sakoman 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 | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index ed1c9c9..cbcf2b8 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -2653,9 +2653,11 @@ static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, } if (!type) { +#ifndef CONFIG_SYS_NAND_QUIET_TEST printk(KERN_INFO "%s: unknown NAND device: Manufacturer ID:" " 0x%02x, Chip ID: 0x%02x\n", __func__, *maf_id, dev_id); +#endif return ERR_PTR(-ENODEV); }