projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'pci-v3.17-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
block
/
partitions
/
amiga.c
diff --git
a/block/partitions/amiga.c
b/block/partitions/amiga.c
index 70cbf44a1560d5f78a1f0cf0c8b340ec315e4899..2b13533d60a294e43f460fe1276256e34ef6b256 100644
(file)
--- a/
block/partitions/amiga.c
+++ b/
block/partitions/amiga.c
@@
-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/affs_hardblocks.h>
#include <linux/types.h>
#include <linux/affs_hardblocks.h>
@@
-40,7
+42,7
@@
int amiga_partition(struct parsed_partitions *state)
data = read_part_sector(state, blk, §);
if (!data) {
if (warn_no_part)
data = read_part_sector(state, blk, §);
if (!data) {
if (warn_no_part)
- pr
intk
("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;
bdevname(state->bdev, b), blk);
res = -1;
goto rdb_done;
@@
-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) {
*(__be32 *)(data+0xdc) = 0;
if (checksum_block((__be32 *)data,
be32_to_cpu(rdb->rdb_SummedLongs) & 0x7F)==0) {
- pr
intk("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;
}
break;
}
- pr
intk
("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)
data = read_part_sector(state, blk, §);
if (!data) {
if (warn_no_part)
data = read_part_sector(state, blk, §);
if (!data) {
if (warn_no_part)
- pr
intk
("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;
bdevname(state->bdev, b), blk);
res = -1;
goto rdb_done;