* [U-Boot] [PATCH V3 08/11] mtd: nand: supress 'unknown NAND' warning if no nand is found
@ 2010-09-08 12:53 Steve Sakoman
2010-09-08 16:12 ` Scott Wood
0 siblings, 1 reply; 3+ messages in thread
From: Steve Sakoman @ 2010-09-08 12:53 UTC (permalink / raw)
To: u-boot
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 <steve@sakoman.com>
---
drivers/mtd/nand/nand_base.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index ed1c9c9..7d17846 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -2653,9 +2653,12 @@ 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__,
- *maf_id, dev_id);
+ /* 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
^ permalink raw reply related [flat|nested] 3+ messages in thread* [U-Boot] [PATCH V3 08/11] mtd: nand: supress 'unknown NAND' warning if no nand is found
2010-09-08 12:53 [U-Boot] [PATCH V3 08/11] mtd: nand: supress 'unknown NAND' warning if no nand is found Steve Sakoman
@ 2010-09-08 16:12 ` Scott Wood
2010-09-08 16:32 ` Paulraj, Sandeep
0 siblings, 1 reply; 3+ messages in thread
From: Scott Wood @ 2010-09-08 16:12 UTC (permalink / raw)
To: u-boot
On Wed, 8 Sep 2010 05:53:57 -0700
Steve Sakoman <steve@sakoman.com> wrote:
> 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 <steve@sakoman.com>
> ---
> drivers/mtd/nand/nand_base.c | 9 ++++++---
> 1 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
> index ed1c9c9..7d17846 100644
> --- a/drivers/mtd/nand/nand_base.c
> +++ b/drivers/mtd/nand/nand_base.c
> @@ -2653,9 +2653,12 @@ 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__,
> - *maf_id, dev_id);
> + /* 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);
> }
>
Acked-by: Scott Wood <scottwood@freescale.com>
-Scott
^ permalink raw reply [flat|nested] 3+ messages in thread* [U-Boot] [PATCH V3 08/11] mtd: nand: supress 'unknown NAND' warning if no nand is found
2010-09-08 16:12 ` Scott Wood
@ 2010-09-08 16:32 ` Paulraj, Sandeep
0 siblings, 0 replies; 3+ messages in thread
From: Paulraj, Sandeep @ 2010-09-08 16:32 UTC (permalink / raw)
To: u-boot
>
> On Wed, 8 Sep 2010 05:53:57 -0700
> Steve Sakoman <steve@sakoman.com> wrote:
>
> > 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 <steve@sakoman.com>
> > ---
> > drivers/mtd/nand/nand_base.c | 9 ++++++---
> > 1 files changed, 6 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
> > index ed1c9c9..7d17846 100644
> > --- a/drivers/mtd/nand/nand_base.c
> > +++ b/drivers/mtd/nand/nand_base.c
> > @@ -2653,9 +2653,12 @@ 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__,
> > - *maf_id, dev_id);
> > + /* 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);
> > }
> >
>
> Acked-by: Scott Wood <scottwood@freescale.com>
>
> -Scott
Thanks Scott,
I'll add it to my tree
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-09-08 16:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-08 12:53 [U-Boot] [PATCH V3 08/11] mtd: nand: supress 'unknown NAND' warning if no nand is found Steve Sakoman
2010-09-08 16:12 ` Scott Wood
2010-09-08 16:32 ` Paulraj, Sandeep
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox