aboutsummaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2014-06-12 14:04:52 -0400
committerJens Axboe <axboe@fb.com>2014-07-01 12:40:02 -0400
commit600ffc5ead7fd0bc5b9950842b2aece26682b0e0 (patch)
tree620ef226ac194aebed2b66c08cb8cfa290d77b51 /block
parent472d5e2af28cc6ae9749ce22f951ea426fdfc392 (diff)
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: Fabian Frederick <fabf@skynet.be> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block')
-rw-r--r--block/partitions/amiga.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/block/partitions/amiga.c b/block/partitions/amiga.c
index 70cbf44a1560..2b13533d60a2 100644
--- a/block/partitions/amiga.c
+++ b/block/partitions/amiga.c
@@ -7,6 +7,8 @@
7 * Re-organised Feb 1998 Russell King 7 * Re-organised Feb 1998 Russell King
8 */ 8 */
9 9
10#define pr_fmt(fmt) fmt
11
10#include <linux/types.h> 12#include <linux/types.h>
11#include <linux/affs_hardblocks.h> 13#include <linux/affs_hardblocks.h>
12 14
@@ -40,7 +42,7 @@ int amiga_partition(struct parsed_partitions *state)
40 data = read_part_sector(state, blk, &sect); 42 data = read_part_sector(state, blk, &sect);
41 if (!data) { 43 if (!data) {
42 if (warn_no_part) 44 if (warn_no_part)
43 printk("Dev %s: unable to read RDB block %d\n", 45 pr_err("Dev %s: unable to read RDB block %d\n",
44 bdevname(state->bdev, b), blk); 46 bdevname(state->bdev, b), blk);
45 res = -1; 47 res = -1;
46 goto rdb_done; 48 goto rdb_done;
@@ -57,12 +59,12 @@ int amiga_partition(struct parsed_partitions *state)
57 *(__be32 *)(data+0xdc) = 0; 59 *(__be32 *)(data+0xdc) = 0;
58 if (checksum_block((__be32 *)data, 60 if (checksum_block((__be32 *)data,
59 be32_to_cpu(rdb->rdb_SummedLongs) & 0x7F)==0) { 61 be32_to_cpu(rdb->rdb_SummedLongs) & 0x7F)==0) {
60 printk("Warning: Trashed word at 0xd0 in block %d " 62 pr_err("Trashed word at 0xd0 in block %d ignored in checksum calculation\n",
61 "ignored in checksum calculation\n",blk); 63 blk);
62 break; 64 break;
63 } 65 }
64 66
65 printk("Dev %s: RDB in block %d has bad checksum\n", 67 pr_err("Dev %s: RDB in block %d has bad checksum\n",
66 bdevname(state->bdev, b), blk); 68 bdevname(state->bdev, b), blk);
67 } 69 }
68 70
@@ -83,7 +85,7 @@ int amiga_partition(struct parsed_partitions *state)
83 data = read_part_sector(state, blk, &sect); 85 data = read_part_sector(state, blk, &sect);
84 if (!data) { 86 if (!data) {
85 if (warn_no_part) 87 if (warn_no_part)
86 printk("Dev %s: unable to read partition block %d\n", 88 pr_err("Dev %s: unable to read partition block %d\n",
87 bdevname(state->bdev, b), blk); 89 bdevname(state->bdev, b), blk);
88 res = -1; 90 res = -1;
89 goto rdb_done; 91 goto rdb_done;