[U-Boot] [PATCH V2 08/11] mtd: nand: supress 'unknown NAND' warning if no nand is found

[Scott Wood]

On Sat, 4 Sep 2010 12:38:34 -0500
"Paulraj, Sandeep" <s-paulraj at ti.com> wrote:

> Scott,
> 
> Is it ok if I add this to my tree?

Yes, once the whitespace is fixed.

> 
> Its part of a 11 patch series and a total of some 20 patches submitted by Steve 
> 
> 
> > ---
> >  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);

printk's continuation lines need one more tab.

-Scott