Skip to content

Commit

Permalink
block/partitions/amiga.c: replace nolevel printk by pr_err
Browse files Browse the repository at this point in the history
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: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Jens Axboe <axboe@fb.com>
  • Loading branch information
Fabian Frederick authored and axboe committed Jul 1, 2014
1 parent 472d5e2 commit 600ffc5
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions block/partitions/amiga.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
* Re-organised Feb 1998 Russell King
*/

#define pr_fmt(fmt) fmt

#include <linux/types.h>
#include <linux/affs_hardblocks.h>

Expand Down Expand Up @@ -40,7 +42,7 @@ int amiga_partition(struct parsed_partitions *state)
data = read_part_sector(state, blk, &sect);
if (!data) {
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);
res = -1;
goto rdb_done;
Expand All @@ -57,12 +59,12 @@ int amiga_partition(struct parsed_partitions *state)
*(__be32 *)(data+0xdc) = 0;
if (checksum_block((__be32 *)data,
be32_to_cpu(rdb->rdb_SummedLongs) & 0x7F)==0) {
printk("Warning: Trashed word at 0xd0 in block %d "
"ignored in checksum calculation\n",blk);
pr_err("Trashed word at 0xd0 in block %d ignored in checksum calculation\n",
blk);
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);
}

Expand All @@ -83,7 +85,7 @@ int amiga_partition(struct parsed_partitions *state)
data = read_part_sector(state, blk, &sect);
if (!data) {
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);
res = -1;
goto rdb_done;
Expand Down

0 comments on commit 600ffc5

Please sign in to comment.