mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-07-22 02:17:36 -04:00
mtd: inftlmount: convert printk(KERN_WARNING) to pr_warn
Replace all printk(KERN_WARNING ...) calls with pr_warn() to follow the kernel's recommended logging style and resolve checkpatch warnings. Also convert one bare printk() that was missing a log level. No functional change. Signed-off-by: Li Xinyu <xinyuili@126.com> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
This commit is contained in:
@@ -67,12 +67,12 @@ static int find_boot_record(struct INFTLrecord *inftl)
|
||||
static int warncount = 5;
|
||||
|
||||
if (warncount) {
|
||||
printk(KERN_WARNING "INFTL: block read at 0x%x "
|
||||
pr_warn("INFTL: block read at 0x%x "
|
||||
"of mtd%d failed: %d\n",
|
||||
block * inftl->EraseSize,
|
||||
inftl->mbd.mtd->index, ret);
|
||||
if (!--warncount)
|
||||
printk(KERN_WARNING "INFTL: further "
|
||||
pr_warn("INFTL: further "
|
||||
"failures for this block will "
|
||||
"not be printed\n");
|
||||
}
|
||||
@@ -89,7 +89,7 @@ static int find_boot_record(struct INFTLrecord *inftl)
|
||||
block * inftl->EraseSize + SECTORSIZE + 8,
|
||||
8, &retlen,(char *)&h1);
|
||||
if (ret < 0) {
|
||||
printk(KERN_WARNING "INFTL: ANAND header found at "
|
||||
pr_warn("INFTL: ANAND header found at "
|
||||
"0x%x in mtd%d, but OOB data read failed "
|
||||
"(err %d)\n", block * inftl->EraseSize,
|
||||
inftl->mbd.mtd->index, ret);
|
||||
@@ -107,13 +107,13 @@ static int find_boot_record(struct INFTLrecord *inftl)
|
||||
mtd_read(mtd, block * inftl->EraseSize + 4096, SECTORSIZE,
|
||||
&retlen, buf);
|
||||
if (retlen != SECTORSIZE) {
|
||||
printk(KERN_WARNING "INFTL: Unable to read spare "
|
||||
pr_warn("INFTL: Unable to read spare "
|
||||
"Media Header\n");
|
||||
return -1;
|
||||
}
|
||||
/* Check if this one is the same as the first one we found. */
|
||||
if (memcmp(mh, buf, sizeof(struct INFTLMediaHeader))) {
|
||||
printk(KERN_WARNING "INFTL: Primary and spare Media "
|
||||
pr_warn("INFTL: Primary and spare Media "
|
||||
"Headers disagree.\n");
|
||||
return -1;
|
||||
}
|
||||
@@ -141,14 +141,14 @@ static int find_boot_record(struct INFTLrecord *inftl)
|
||||
mh->OsakVersion, mh->PercentUsed);
|
||||
|
||||
if (mh->NoOfBDTLPartitions == 0) {
|
||||
printk(KERN_WARNING "INFTL: Media Header sanity check "
|
||||
pr_warn("INFTL: Media Header sanity check "
|
||||
"failed: NoOfBDTLPartitions (%d) == 0, "
|
||||
"must be at least 1\n", mh->NoOfBDTLPartitions);
|
||||
return -1;
|
||||
}
|
||||
|
||||
if ((mh->NoOfBDTLPartitions + mh->NoOfBinaryPartitions) > 4) {
|
||||
printk(KERN_WARNING "INFTL: Media Header sanity check "
|
||||
pr_warn("INFTL: Media Header sanity check "
|
||||
"failed: Total Partitions (%d) > 4, "
|
||||
"BDTL=%d Binary=%d\n", mh->NoOfBDTLPartitions +
|
||||
mh->NoOfBinaryPartitions,
|
||||
@@ -158,12 +158,12 @@ static int find_boot_record(struct INFTLrecord *inftl)
|
||||
}
|
||||
|
||||
if (mh->BlockMultiplierBits > 1) {
|
||||
printk(KERN_WARNING "INFTL: sorry, we don't support "
|
||||
pr_warn("INFTL: sorry, we don't support "
|
||||
"UnitSizeFactor 0x%02x\n",
|
||||
mh->BlockMultiplierBits);
|
||||
return -1;
|
||||
} else if (mh->BlockMultiplierBits == 1) {
|
||||
printk(KERN_WARNING "INFTL: support for INFTL with "
|
||||
pr_warn("INFTL: support for INFTL with "
|
||||
"UnitSizeFactor 0x%02x is experimental\n",
|
||||
mh->BlockMultiplierBits);
|
||||
inftl->EraseSize = inftl->mbd.mtd->erasesize <<
|
||||
@@ -207,7 +207,7 @@ static int find_boot_record(struct INFTLrecord *inftl)
|
||||
mtd_erase(mtd, instr);
|
||||
}
|
||||
if ((ip->lastUnit - ip->firstUnit + 1) < ip->virtualUnits) {
|
||||
printk(KERN_WARNING "INFTL: Media Header "
|
||||
pr_warn("INFTL: Media Header "
|
||||
"Partition %d sanity check failed\n"
|
||||
" firstUnit %d : lastUnit %d > "
|
||||
"virtualUnits %d\n", i, ip->lastUnit,
|
||||
@@ -215,7 +215,7 @@ static int find_boot_record(struct INFTLrecord *inftl)
|
||||
return -1;
|
||||
}
|
||||
if (ip->Reserved1 != 0) {
|
||||
printk(KERN_WARNING "INFTL: Media Header "
|
||||
pr_warn("INFTL: Media Header "
|
||||
"Partition %d sanity check failed: "
|
||||
"Reserved1 %d != 0\n",
|
||||
i, ip->Reserved1);
|
||||
@@ -227,7 +227,7 @@ static int find_boot_record(struct INFTLrecord *inftl)
|
||||
}
|
||||
|
||||
if (i >= 4) {
|
||||
printk(KERN_WARNING "INFTL: Media Header Partition "
|
||||
pr_warn("INFTL: Media Header Partition "
|
||||
"sanity check failed:\n No partition "
|
||||
"marked as Disk Partition\n");
|
||||
return -1;
|
||||
@@ -237,7 +237,7 @@ static int find_boot_record(struct INFTLrecord *inftl)
|
||||
inftl->numvunits = ip->virtualUnits;
|
||||
if (inftl->numvunits > (inftl->nb_blocks -
|
||||
inftl->nb_boot_blocks - 2)) {
|
||||
printk(KERN_WARNING "INFTL: Media Header sanity check "
|
||||
pr_warn("INFTL: Media Header sanity check "
|
||||
"failed:\n numvunits (%d) > nb_blocks "
|
||||
"(%d) - nb_boot_blocks(%d) - 2\n",
|
||||
inftl->numvunits, inftl->nb_blocks,
|
||||
@@ -385,7 +385,7 @@ int INFTL_formatblock(struct INFTLrecord *inftl, int block)
|
||||
|
||||
ret = mtd_erase(inftl->mbd.mtd, instr);
|
||||
if (ret) {
|
||||
printk(KERN_WARNING "INFTL: error while formatting block %d\n",
|
||||
pr_warn("INFTL: error while formatting block %d\n",
|
||||
block);
|
||||
goto fail;
|
||||
}
|
||||
@@ -428,13 +428,13 @@ static void format_chain(struct INFTLrecord *inftl, unsigned int first_block)
|
||||
{
|
||||
unsigned int block = first_block, block1;
|
||||
|
||||
printk(KERN_WARNING "INFTL: formatting chain at block %d\n",
|
||||
pr_warn("INFTL: formatting chain at block %d\n",
|
||||
first_block);
|
||||
|
||||
for (;;) {
|
||||
block1 = inftl->PUtable[block];
|
||||
|
||||
printk(KERN_WARNING "INFTL: formatting block %d\n", block);
|
||||
pr_warn("INFTL: formatting block %d\n", block);
|
||||
if (INFTL_formatblock(inftl, block) < 0) {
|
||||
/*
|
||||
* Cannot format !!!! Mark it as Bad Unit,
|
||||
@@ -539,7 +539,7 @@ int INFTL_mount(struct INFTLrecord *s)
|
||||
|
||||
/* Search for INFTL MediaHeader and Spare INFTL Media Header */
|
||||
if (find_boot_record(s) < 0) {
|
||||
printk(KERN_WARNING "INFTL: could not find valid boot record?\n");
|
||||
pr_warn("INFTL: could not find valid boot record?\n");
|
||||
return -ENXIO;
|
||||
}
|
||||
|
||||
@@ -610,7 +610,7 @@ int INFTL_mount(struct INFTLrecord *s)
|
||||
|
||||
/* Check for invalid block */
|
||||
if (erase_mark != ERASE_MARK) {
|
||||
printk(KERN_WARNING "INFTL: corrupt block %d "
|
||||
pr_warn("INFTL: corrupt block %d "
|
||||
"in chain %d, chain length %d, erase "
|
||||
"mark 0x%x?\n", block, first_block,
|
||||
chain_length, erase_mark);
|
||||
@@ -635,7 +635,7 @@ int INFTL_mount(struct INFTLrecord *s)
|
||||
((prev_block >= s->nb_blocks) &&
|
||||
(prev_block != BLOCK_NIL))) {
|
||||
if (chain_length > 0) {
|
||||
printk(KERN_WARNING "INFTL: corrupt "
|
||||
pr_warn("INFTL: corrupt "
|
||||
"block %d in chain %d?\n",
|
||||
block, first_block);
|
||||
do_format_chain++;
|
||||
@@ -670,7 +670,7 @@ int INFTL_mount(struct INFTLrecord *s)
|
||||
|
||||
/* Validate next block before following it... */
|
||||
if (block > s->lastEUN) {
|
||||
printk(KERN_WARNING "INFTL: invalid previous "
|
||||
pr_warn("INFTL: invalid previous "
|
||||
"block %d in chain %d?\n", block,
|
||||
first_block);
|
||||
do_format_chain++;
|
||||
@@ -714,7 +714,7 @@ int INFTL_mount(struct INFTLrecord *s)
|
||||
if (s->PUtable[block] == BLOCK_NIL)
|
||||
break;
|
||||
if (s->PUtable[block] > s->lastEUN) {
|
||||
printk(KERN_WARNING "INFTL: invalid prev %d, "
|
||||
pr_warn("INFTL: invalid prev %d, "
|
||||
"in virtual chain %d\n",
|
||||
s->PUtable[block], logical_block);
|
||||
s->PUtable[block] = BLOCK_NIL;
|
||||
@@ -757,7 +757,7 @@ int INFTL_mount(struct INFTLrecord *s)
|
||||
pr_debug("INFTL: pass 3, format unused blocks\n");
|
||||
for (block = s->firstEUN; block <= s->lastEUN; block++) {
|
||||
if (s->PUtable[block] == BLOCK_NOTEXPLORED) {
|
||||
printk("INFTL: unreferenced block %d, formatting it\n",
|
||||
pr_warn("INFTL: unreferenced block %d, formatting it\n",
|
||||
block);
|
||||
if (INFTL_formatblock(s, block) < 0)
|
||||
s->PUtable[block] = BLOCK_RESERVED;
|
||||
|
||||
Reference in New Issue
Block a user