Skip to contentSkip to conversation

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

PATCH New Steve Sakoman 3 participants 3 messages Sep 8, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v3 8/11 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

---
 drivers/mtd/nand/nand_base.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
drivers/mtd/nand/nand_base.c +6 -3
index ed1c9c9..7d17846 100644
@@ -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);
 	}
 
Signature · 1 line
1.7.0.4
#1 lore raw

PATCH v3 8/11 mtd: nand: supress 'unknown NAND' warning if no nand is found

Quoted 24 lines · On Wed, 8 Sep 2010 05:53:57 -0700 Steve Sakoman <[email protected]> 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

---
 drivers/mtd/nand/nand_base.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
drivers/mtd/nand/nand_base.c +0 -2
index ed1c9c9..7d17846 100644
@@ -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__,

drivers/mtd/nand/nand_base.c static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, · line 2664

Quoted 10 lines
drivers/mtd/nand/nand_base.c +6 -1
-		       *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);
 	}
 

-Scott

#2 lore raw

PATCH v3 8/11 mtd: nand: supress 'unknown NAND' warning if no nand is found

Quoted 45 lines
Quoted 4 lines · On Wed, 8 Sep 2010 05:53:57 -0700 Steve Sakoman <[email protected]> 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

drivers/mtd/nand/nand_base.c static struct nand_flash_dev

Quoted 15 lines

instead of:

NAND: 0 MiB

---
 drivers/mtd/nand/nand_base.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
drivers/mtd/nand/nand_base.c +0 -0
index ed1c9c9..7d17846 100644
@@ -2653,9 +2653,12 @@ static struct nand_flash_dev

*nand_get_flash_type(struct mtd_info *mtd,

Quoted 5 lines
drivers/mtd/nand/nand_base.c +0 -2
 	}
 
 	if (!type) {
-		printk(KERN_INFO "%s: unknown NAND device: Manufacturer ID:"
-		       " 0x%02x, Chip ID: 0x%02x\n", __func__,

drivers/mtd/nand/nand_base.c static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, · line 2664

Quoted 10 lines
drivers/mtd/nand/nand_base.c +6 -1
-		       *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);
 	}
 
Quoted 1 line

-Scott

Thanks Scott,

I'll add it to my tree