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

Commit 2ac63d90 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Brian Norris
Browse files

mtd: nand: don't break long print messages 



This follows Chapter 2 of Linux's CodingStyle:
> However, never break user-visible strings such as printk messages,
> because that breaks the ability to grep for them.

Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent b7ab610f

drivers/mtd/nand/nand_base.c

+5 −9
Original line number Diff line number Diff line
@@ -3936,8 +3936,7 @@ int nand_scan_tail(struct mtd_info *mtd) 
	case NAND_ECC_HW_OOB_FIRST:

		/* Similar to NAND_ECC_HW, but a separate read_page handle */

		if (!ecc->calculate || !ecc->correct || !ecc->hwctl) {

			pr_warn("No ECC functions supplied; "

				   "hardware ECC not possible\n");

			pr_warn("No ECC functions supplied; hardware ECC not possible\n");

			BUG();

		}

		if (!ecc->read_page)
@@ -3968,8 +3967,7 @@ int nand_scan_tail(struct mtd_info *mtd) 
		     ecc->read_page == nand_read_page_hwecc ||

		     !ecc->write_page ||

		     ecc->write_page == nand_write_page_hwecc)) {

			pr_warn("No ECC functions supplied; "

				   "hardware ECC not possible\n");

			pr_warn("No ECC functions supplied; hardware ECC not possible\n");

			BUG();

		}

		/* Use standard syndrome read/write page function? */
@@ -3993,8 +3991,7 @@ int nand_scan_tail(struct mtd_info *mtd) 
			}

			break;

		}

		pr_warn("%d byte HW ECC not possible on "

			   "%d byte page size, fallback to SW ECC\n",

		pr_warn("%d byte HW ECC not possible on %d byte page size, fallback to SW ECC\n",

			ecc->size, mtd->writesize);

		ecc->mode = NAND_ECC_SOFT;
@@ -4048,8 +4045,7 @@ int nand_scan_tail(struct mtd_info *mtd) 
		break;



	case NAND_ECC_NONE:

		pr_warn("NAND_ECC_NONE selected by board driver. "

			   "This is not recommended!\n");

		pr_warn("NAND_ECC_NONE selected by board driver. This is not recommended!\n");

		ecc->read_page = nand_read_page_raw;

		ecc->write_page = nand_write_page_raw;

		ecc->read_oob = nand_read_oob_std;

drivers/mtd/nand/nand_bbt.c

+10 −13
Original line number Diff line number Diff line
@@ -201,12 +201,12 @@ static int read_bbt(struct mtd_info *mtd, uint8_t *buf, int page, int num, 
		res = mtd_read(mtd, from, len, &retlen, buf);

		if (res < 0) {

			if (mtd_is_eccerr(res)) {

				pr_info("nand_bbt: ECC error in BBT at "

					"0x%012llx\n", from & ~mtd->writesize);

				pr_info("nand_bbt: ECC error in BBT at 0x%012llx\n",

					from & ~mtd->writesize);

				return res;

			} else if (mtd_is_bitflip(res)) {

				pr_info("nand_bbt: corrected error in BBT at "

					"0x%012llx\n", from & ~mtd->writesize);

				pr_info("nand_bbt: corrected error in BBT at 0x%012llx\n",

					from & ~mtd->writesize);

				ret = res;

			} else {

				pr_info("nand_bbt: error reading BBT\n");
@@ -580,8 +580,8 @@ static int search_bbt(struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr 
		if (td->pages[i] == -1)

			pr_warn("Bad block table not found for chip %d\n", i);

		else

			pr_info("Bad block table found at page %d, version "

				 "0x%02X\n", td->pages[i], td->version[i]);

			pr_info("Bad block table found at page %d, version 0x%02X\n",

				td->pages[i], td->version[i]);

	}

	return 0;

}
@@ -725,12 +725,10 @@ static int write_bbt(struct mtd_info *mtd, uint8_t *buf, 
			res = mtd_read(mtd, to, len, &retlen, buf);

			if (res < 0) {

				if (retlen != len) {

					pr_info("nand_bbt: error reading block "

						"for writing the bad block table\n");

					pr_info("nand_bbt: error reading block for writing the bad block table\n");

					return res;

				}

				pr_warn("nand_bbt: ECC error while reading "

					"block for writing bad block table\n");

				pr_warn("nand_bbt: ECC error while reading block for writing bad block table\n");

			}

			/* Read oob data */

			ops.ooblen = (len >> this->page_shift) * mtd->oobsize;
@@ -1338,8 +1336,7 @@ int nand_isbad_bbt(struct mtd_info *mtd, loff_t offs, int allowbbt) 
	block = (int)(offs >> this->bbt_erase_shift);

	res = bbt_get_entry(this, block);



	pr_debug("nand_isbad_bbt(): bbt info for offs 0x%08x: "

			"(block %d) 0x%02x\n",

	pr_debug("nand_isbad_bbt(): bbt info for offs 0x%08x: (block %d) 0x%02x\n",

		 (unsigned int)offs, block, res);



	switch (res) {