Commit 600ffc5e authored by Fabian Frederick's avatar Fabian Frederick Committed by Jens Axboe

block/partitions/amiga.c: replace nolevel printk by pr_err

Also add no prefix pr_fmt to avoid any future default format update

Cc: Jens Axboe <axboe@kernel.dk>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 472d5e2a
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
* Re-organised Feb 1998 Russell King * Re-organised Feb 1998 Russell King
*/ */
#define pr_fmt(fmt) fmt
#include <linux/types.h> #include <linux/types.h>
#include <linux/affs_hardblocks.h> #include <linux/affs_hardblocks.h>
...@@ -40,7 +42,7 @@ int amiga_partition(struct parsed_partitions *state) ...@@ -40,7 +42,7 @@ int amiga_partition(struct parsed_partitions *state)
data = read_part_sector(state, blk, &sect); data = read_part_sector(state, blk, &sect);
if (!data) { if (!data) {
if (warn_no_part) if (warn_no_part)
printk("Dev %s: unable to read RDB block %d\n", pr_err("Dev %s: unable to read RDB block %d\n",
bdevname(state->bdev, b), blk); bdevname(state->bdev, b), blk);
res = -1; res = -1;
goto rdb_done; goto rdb_done;
...@@ -57,12 +59,12 @@ int amiga_partition(struct parsed_partitions *state) ...@@ -57,12 +59,12 @@ int amiga_partition(struct parsed_partitions *state)
*(__be32 *)(data+0xdc) = 0; *(__be32 *)(data+0xdc) = 0;
if (checksum_block((__be32 *)data, if (checksum_block((__be32 *)data,
be32_to_cpu(rdb->rdb_SummedLongs) & 0x7F)==0) { be32_to_cpu(rdb->rdb_SummedLongs) & 0x7F)==0) {
printk("Warning: Trashed word at 0xd0 in block %d " pr_err("Trashed word at 0xd0 in block %d ignored in checksum calculation\n",
"ignored in checksum calculation\n",blk); blk);
break; break;
} }
printk("Dev %s: RDB in block %d has bad checksum\n", pr_err("Dev %s: RDB in block %d has bad checksum\n",
bdevname(state->bdev, b), blk); bdevname(state->bdev, b), blk);
} }
...@@ -83,7 +85,7 @@ int amiga_partition(struct parsed_partitions *state) ...@@ -83,7 +85,7 @@ int amiga_partition(struct parsed_partitions *state)
data = read_part_sector(state, blk, &sect); data = read_part_sector(state, blk, &sect);
if (!data) { if (!data) {
if (warn_no_part) if (warn_no_part)
printk("Dev %s: unable to read partition block %d\n", pr_err("Dev %s: unable to read partition block %d\n",
bdevname(state->bdev, b), blk); bdevname(state->bdev, b), blk);
res = -1; res = -1;
goto rdb_done; goto rdb_done;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment