mm: kmem: rename (__)memcg_kmem_(un)charge_memcg() to __memcg_kmem_(un)charge()

[linux-2.6-microblaze.git] / block / partitions / amiga.c

diff --git a/block/partitions/amiga.c b/block/partitions/amiga.c
index 5609366..9526491 100644 (file)
--- a/block/partitions/amiga.c
+++ b/block/partitions/amiga.c
@@ -14,7 +14,6 @@
 #include <linux/affs_hardblocks.h>
 
 #include "check.h"
-#include "amiga.h"
 
 static __inline__ u32
 checksum_block(__be32 *m, int size)
@@ -42,9 +41,8 @@ int amiga_partition(struct parsed_partitions *state)
                        goto rdb_done;
                data = read_part_sector(state, blk, &sect);
                if (!data) {
-                       if (warn_no_part)
-                               pr_err("Dev %s: unable to read RDB block %d\n",
-                                      bdevname(state->bdev, b), blk);
+                       pr_err("Dev %s: unable to read RDB block %d\n",
+                              bdevname(state->bdev, b), blk);
                        res = -1;
                        goto rdb_done;
                }
@@ -85,9 +83,8 @@ int amiga_partition(struct parsed_partitions *state)
                blk *= blksize; /* Read in terms partition table understands */
                data = read_part_sector(state, blk, &sect);
                if (!data) {
-                       if (warn_no_part)
-                               pr_err("Dev %s: unable to read partition block %d\n",
-                                      bdevname(state->bdev, b), blk);
+                       pr_err("Dev %s: unable to read partition block %d\n",
+                              bdevname(state->bdev, b), blk);
                        res = -1;
                        goto rdb_done;
                }