From patchwork Tue Aug 31 23:21:24 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 71836 Return-Path: X-Original-To: wd@gemini.denx.de Delivered-To: wd@gemini.denx.de Received: from diddl.denx.de (diddl.denx.de [10.0.0.6]) by gemini.denx.de (Postfix) with ESMTP id AE2BB157D71 for ; Wed, 1 Sep 2010 01:25:16 +0200 (CEST) Received: from diddl.denx.de (localhost.localdomain [127.0.0.1]) by diddl.denx.de (Postfix) with ESMTP id 9A31B30E1863 for ; Wed, 1 Sep 2010 01:25:16 +0200 (MEST) Received: from pop.mnet-online.de by diddl.denx.de with POP3 (fetchmail-6.3.17) for (single-drop); Wed, 01 Sep 2010 01:25:16 +0200 (MEST) Received: from murder ([192.168.8.180]) by backend2 (Cyrus v2.2.12) with LMTPA; Wed, 01 Sep 2010 01:24:08 +0200 X-Sieve: CMU Sieve 2.2 Received: from mail.m-online.net (localhost [127.0.0.1]) by frontend1.mail.m-online.net (Cyrus v2.2.12) with LMTPA; Wed, 01 Sep 2010 01:24:07 +0200 Received: from scanner-1.m-online.net (scanner-1.mail.m-online.net [192.168.8.165]) by mail.m-online.net (Postfix) with ESMTP id DF4A21C0019E; Wed, 1 Sep 2010 01:24:07 +0200 (CEST) Received: from mxin-1.m-online.net ([192.168.6.164]) by scanner-1.m-online.net (scanner-1.m-online.net [192.168.8.165]) (amavisd-new, port 10026) with ESMTP id 11860-03; Wed, 1 Sep 2010 01:24:06 +0200 (CEST) Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by mxin-1.m-online.net (Postfix) with ESMTP id EF48846C0A6; Wed, 1 Sep 2010 01:24:05 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D31DD28116; Wed, 1 Sep 2010 01:23:09 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id R1I8zCIaMaPy; Wed, 1 Sep 2010 01:23:09 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 03F7A2811B; Wed, 1 Sep 2010 01:22:54 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0FB7428114 for ; Wed, 1 Sep 2010 01:22:51 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TvRl32J9RR30 for ; Wed, 1 Sep 2010 01:22:49 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-vw0-f44.google.com (mail-vw0-f44.google.com [209.85.212.44]) by theia.denx.de (Postfix) with ESMTP id 00FF3280E8 for ; Wed, 1 Sep 2010 01:22:32 +0200 (CEST) Received: by mail-vw0-f44.google.com with SMTP id 10so5496397vws.3 for ; Tue, 31 Aug 2010 16:22:32 -0700 (PDT) Received: by 10.220.63.142 with SMTP id b14mr3780505vci.34.1283296952544; Tue, 31 Aug 2010 16:22:32 -0700 (PDT) Received: from localhost.localdomain (static-74-41-60-154.dsl1.pco.ca.frontiernet.net [74.41.60.154]) by mx.google.com with ESMTPS id m6sm3171449vcx.24.2010.08.31.16.22.30 (version=SSLv3 cipher=RC4-MD5); Tue, 31 Aug 2010 16:22:31 -0700 (PDT) From: Steve Sakoman To: u-boot@lists.denx.de Date: Tue, 31 Aug 2010 16:21:24 -0700 Message-Id: <1283296887-8631-9-git-send-email-steve@sakoman.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1283296887-8631-1-git-send-email-steve@sakoman.com> References: <1283296887-8631-1-git-send-email-steve@sakoman.com> Cc: Steve Sakoman Subject: [U-Boot] [PATCH 08/11] mtd: nand: honor CONFIG_SYS_NAND_QUIET_TEST with unknown NAND printk X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de X-Virus-Scanned: by amavisd-new at m-online.net 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); }