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

Commit e8348dc5 authored by Joe Perches's avatar Joe Perches Committed by Brian Norris
Browse files

drivers/mtd: Convert remaining uses of pr_warning to pr_warn 



To enable eventual removal of pr_warning

This makes pr_warn use consistent for drivers/mtd

Prior to this patch, there were 7 uses of pr_warning and
31 uses of pr_warn in drivers/mtd

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent 8c925b26

drivers/mtd/chips/cfi_cmdset_0002.c

+8 −4
Original line number Diff line number Diff line
@@ -323,7 +323,8 @@ static void fixup_sst38vf640x_sectorsize(struct mtd_info *mtd) 
	 * it should report a size of 8KBytes (0x0020*256).

	 */

	cfi->cfiq->EraseRegionInfo[0] = 0x002003ff;

	pr_warning("%s: Bad 38VF640x CFI data; adjusting sector size from 64 to 8KiB\n", mtd->name);

	pr_warn("%s: Bad 38VF640x CFI data; adjusting sector size from 64 to 8KiB\n",

		mtd->name);

}



static void fixup_s29gl064n_sectors(struct mtd_info *mtd)
@@ -333,7 +334,8 @@ static void fixup_s29gl064n_sectors(struct mtd_info *mtd) 


	if ((cfi->cfiq->EraseRegionInfo[0] & 0xffff) == 0x003f) {

		cfi->cfiq->EraseRegionInfo[0] |= 0x0040;

		pr_warning("%s: Bad S29GL064N CFI data; adjust from 64 to 128 sectors\n", mtd->name);

		pr_warn("%s: Bad S29GL064N CFI data; adjust from 64 to 128 sectors\n",

			mtd->name);

	}

}
@@ -344,7 +346,8 @@ static void fixup_s29gl032n_sectors(struct mtd_info *mtd) 


	if ((cfi->cfiq->EraseRegionInfo[1] & 0xffff) == 0x007e) {

		cfi->cfiq->EraseRegionInfo[1] &= ~0x0040;

		pr_warning("%s: Bad S29GL032N CFI data; adjust from 127 to 63 sectors\n", mtd->name);

		pr_warn("%s: Bad S29GL032N CFI data; adjust from 127 to 63 sectors\n",

			mtd->name);

	}

}
@@ -358,7 +361,8 @@ static void fixup_s29ns512p_sectors(struct mtd_info *mtd) 
	 * which is not permitted by CFI.

	 */

	cfi->cfiq->EraseRegionInfo[0] = 0x020001ff;

	pr_warning("%s: Bad S29NS512P CFI data; adjust to 512 sectors\n", mtd->name);

	pr_warn("%s: Bad S29NS512P CFI data; adjust to 512 sectors\n",

		mtd->name);

}



/* Used to fix CFI-Tables of chips without Extended Query Tables */

drivers/mtd/nand/cmx270_nand.c

+2 −2
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ static int __init cmx270_init(void) 


	ret = gpio_request(GPIO_NAND_CS, "NAND CS");

	if (ret) {

		pr_warning("CM-X270: failed to request NAND CS gpio\n");

		pr_warn("CM-X270: failed to request NAND CS gpio\n");

		return ret;

	}
@@ -153,7 +153,7 @@ static int __init cmx270_init(void) 


	ret = gpio_request(GPIO_NAND_RB, "NAND R/B");

	if (ret) {

		pr_warning("CM-X270: failed to request NAND R/B gpio\n");

		pr_warn("CM-X270: failed to request NAND R/B gpio\n");

		goto err_gpio_request;

	}

drivers/mtd/ofpart.c

+2 −2
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ static int parse_ofoldpart_partitions(struct mtd_info *master, 
	if (!part)

		return 0; /* No partitions found */



	pr_warning("Device tree uses obsolete partition map binding: %s\n",

	pr_warn("Device tree uses obsolete partition map binding: %s\n",

		dp->full_name);



	nr_parts = plen / sizeof(part[0]);