Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20171642 authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Brian Norris
Browse files

mtd: nand: refactor print messages 



Add a nice "nand:" prefix to all pr_xxx() messages. This allows
to get rid of the "NAND" words in messages, given the context
is already given by the prefix.

Remove the __func__ report from messages where it's not needed and refactor
the device detection messages to show itself in several lines.

Signed-off-by: default avatarEzequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent 7e8eb8ae

drivers/mtd/nand/nand_base.c

+13 −13
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ 
 *

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/module.h>

#include <linux/delay.h>

#include <linux/errno.h>
@@ -2979,7 +2981,7 @@ static int nand_flash_detect_onfi(struct mtd_info *mtd, struct nand_chip *chip, 
		chip->onfi_version = 10;



	if (!chip->onfi_version) {

		pr_info("%s: unsupported ONFI version: %d\n", __func__, val);

		pr_info("unsupported ONFI version: %d\n", val);

		return 0;

	}
@@ -3372,8 +3374,7 @@ static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, 
		id_data[i] = chip->read_byte(mtd);



	if (id_data[0] != *maf_id || id_data[1] != *dev_id) {

		pr_info("%s: second ID read did not match "

			"%02x,%02x against %02x,%02x\n", __func__,

		pr_info("second ID read did not match %02x,%02x against %02x,%02x\n",

			*maf_id, *dev_id, id_data[0], id_data[1]);

		return ERR_PTR(-ENODEV);

	}
@@ -3440,10 +3441,10 @@ ident_done: 
		 * Check, if buswidth is correct. Hardware drivers should set

		 * chip correct!

		 */

		pr_info("NAND device: Manufacturer ID:"

			" 0x%02x, Chip ID: 0x%02x (%s %s)\n", *maf_id,

			*dev_id, nand_manuf_ids[maf_idx].name, mtd->name);

		pr_warn("NAND bus width %d instead %d bit\n",

		pr_info("device found, Manufacturer ID: 0x%02x, Chip ID: 0x%02x\n",

			*maf_id, *dev_id);

		pr_info("%s %s\n", nand_manuf_ids[maf_idx].name, mtd->name);

		pr_warn("bus width %d instead %d bit\n",

			   (chip->options & NAND_BUSWIDTH_16) ? 16 : 8,

			   busw ? 16 : 8);

		return ERR_PTR(-EINVAL);
@@ -3472,14 +3473,13 @@ ident_done: 
	if (mtd->writesize > 512 && chip->cmdfunc == nand_command)

		chip->cmdfunc = nand_command_lp;



	pr_info("NAND device: Manufacturer ID: 0x%02x, Chip ID: 0x%02x (%s %s)\n",

		*maf_id, *dev_id, nand_manuf_ids[maf_idx].name,

	pr_info("device found, Manufacturer ID: 0x%02x, Chip ID: 0x%02x\n",

		*maf_id, *dev_id);

	pr_info("%s %s\n", nand_manuf_ids[maf_idx].name,

		chip->onfi_version ? chip->onfi_params.model : type->name);



	pr_info("NAND device: %dMiB, %s, page size: %d, OOB size: %d\n",

	pr_info("%dMiB, %s, page size: %d, OOB size: %d\n",

		(int)(chip->chipsize >> 20), nand_is_slc(chip) ? "SLC" : "MLC",

		mtd->writesize, mtd->oobsize);



	return type;

}
@@ -3535,7 +3535,7 @@ int nand_scan_ident(struct mtd_info *mtd, int maxchips, 
		chip->select_chip(mtd, -1);

	}

	if (i > 1)

		pr_info("%d NAND chips detected\n", i);

		pr_info("%d chips detected\n", i);



	/* Store the number of chips and calc total size for mtd */

	chip->numchips = i;