mtd: nand: supress 'unknown NAND' warning if no nand is found

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 <[email protected]>
Acked-by: Scott Wood <[email protected]>
Signed-off-by: Sandeep Paulraj <[email protected]>

diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index ed1c9c9a88aa906b70dbd83698f7406e010dd774..7d178468adbe4fa0954b1d5f932a35c1f0deafdf 100644 (file)
--- 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);
        }