mtd: nand: add option to quieten off the no device found messgae (b1c6e6db) · Commits · 戴 / test

Add NAND_SCAN_SILENT_NODEV to chip->options to the user-worrying messages 'No NAND device found!!!'. This message often worries users (was three exclamation marks really necessary?) and especially in systems such as the Simtec Osiris where there may be optional NAND devices which are not known until probe time. Revised version of the original NAND_PROBE_SPECULATIVE patch after comments by Artem Bityutskiy about adding a whole new call. Signed-off-by:

Ben Dooks <ben@simtec.co.uk> Signed-off-by:

Simtec Linux Team <linux@simtec.co.uk> Signed-off-by:

Artem Bityutskiy <Artem.Bityutskiy@nokia.com> Signed-off-by:

David Woodhouse <David.Woodhouse@intel.com>

drivers/mtd/nand/nand_base.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -2756,7 +2756,8 @@ int nand_scan_ident(struct mtd_info *mtd, int maxchips)
		type = nand_get_flash_type(mtd, chip, busw, &nand_maf_id);

		if (IS_ERR(type)) {
		printk(KERN_WARNING "No NAND device found!!!\n");
		if (!(chip->options & NAND_SCAN_SILENT_NODEV))
		printk(KERN_WARNING "No NAND device found.\n");
		chip->select_chip(mtd, -1);
		return PTR_ERR(type);
		}

include/linux/mtd/nand.h

+3 −1

Original line number	Diff line number	Diff line
		@@ -170,7 +170,6 @@ typedef enum {
		/* Chip does not allow subpage writes */
		#define NAND_NO_SUBPAGE_WRITE 0x00000200


		/* Options valid for Samsung large page devices */
		#define NAND_SAMSUNG_LP_OPTIONS \
		(NAND_NO_PADDING \| NAND_CACHEPRG \| NAND_COPYBACK)
		@@ -196,6 +195,9 @@ typedef enum {
		/* This option is defined if the board driver allocates its own buffers
		(e.g. because it needs them DMA-coherent */
		#define NAND_OWN_BUFFERS 0x00040000
		/* Chip may not exist, so silence any errors in scan */
		#define NAND_SCAN_SILENT_NODEV 0x00080000

		/* Options set by nand scan */
		/* Nand scan has allocated controller struct */
		#define NAND_CONTROLLER_ALLOC 0x80000000

Admin message