memblock: Kill MEMBLOCK_ERROR

25818f0f28 (memblock: Make MEMBLOCK_ERROR be 0) thankfully made
MEMBLOCK_ERROR 0 and there already are codes which expect error return
to be 0.  There's no point in keeping MEMBLOCK_ERROR around.  End its
misery.

Signed-off-by: Tejun Heo <tj@kernel.org>
Link: http://lkml.kernel.org/r/1310457490-3356-6-git-send-email-tj@kernel.org
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

5 files changed, 10 insertions, 10 deletions

diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index 30326443ab81..13cf05a61605 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -68,7 +68,7 @@ static void __init find_early_table_space(unsigned long end, int use_pse,
 #endif
 
         base = memblock_find_in_range(start, good_end, tables, PAGE_SIZE);
-        if (base == MEMBLOCK_ERROR)
+        if (!base)
                 panic("Cannot find space for the kernel page tables");
 
         pgt_buf_start = base >> PAGE_SHIFT;
diff --git a/arch/x86/mm/memblock.c b/arch/x86/mm/memblock.c
index 992da5ec5a64..e126117d1b03 100644
--- a/arch/x86/mm/memblock.c
+++ b/arch/x86/mm/memblock.c
@@ -66,7 +66,7 @@ u64 __init memblock_x86_find_in_range_size(u64 start, u64 *sizep, u64 align)
                         return addr;
         }
 
-        return MEMBLOCK_ERROR;
+        return 0;
 }
 
 static __init struct range *find_range_array(int count)
@@ -78,7 +78,7 @@ static __init struct range *find_range_array(int count)
         end = memblock.current_limit;
 
         mem = memblock_find_in_range(0, end, size, sizeof(struct range));
-        if (mem == MEMBLOCK_ERROR)
+        if (!mem)
                 panic("can not find more space for range array");
 
         /*
@@ -274,7 +274,7 @@ u64 __init memblock_x86_find_in_range_node(int nid, u64 start, u64 end, u64 size
 {
         u64 addr;
         addr = find_memory_core_early(nid, size, align, start, end);
-        if (addr != MEMBLOCK_ERROR)
+        if (addr)
                 return addr;
 
         /* Fallback, should already have start end within node range */
diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
index fbeaaf416610..fa1015de5cc0 100644
--- a/arch/x86/mm/numa.c
+++ b/arch/x86/mm/numa.c
@@ -226,10 +226,10 @@ static void __init setup_node_data(int nid, u64 start, u64 end)
         } else {
                 nd_pa = memblock_x86_find_in_range_node(nid, nd_low, nd_high,
                                                 nd_size, SMP_CACHE_BYTES);
-                if (nd_pa == MEMBLOCK_ERROR)
+                if (!nd_pa)
                         nd_pa = memblock_find_in_range(nd_low, nd_high,
                                                 nd_size, SMP_CACHE_BYTES);
-                if (nd_pa == MEMBLOCK_ERROR) {
+                if (!nd_pa) {
                         pr_err("Cannot find %zu bytes in node %d\n",
                                nd_size, nid);
                         return;
@@ -395,7 +395,7 @@ static int __init numa_alloc_distance(void)
 
         phys = memblock_find_in_range(0, PFN_PHYS(max_pfn_mapped),
                                       size, PAGE_SIZE);
-        if (phys == MEMBLOCK_ERROR) {
+        if (!phys) {
                 pr_warning("NUMA: Warning: can't allocate distance table!\n");
                 /* don't retry until explicitly reset */
                 numa_distance = (void *)1LU;
diff --git a/arch/x86/mm/numa_32.c b/arch/x86/mm/numa_32.c
index 3adebe7e536a..58878b536ef2 100644
--- a/arch/x86/mm/numa_32.c
+++ b/arch/x86/mm/numa_32.c
@@ -199,7 +199,7 @@ void __init init_alloc_remap(int nid, u64 start, u64 end)
 
         /* allocate node memory and the lowmem remap area */
         node_pa = memblock_find_in_range(start, end, size, LARGE_PAGE_BYTES);
-        if (node_pa == MEMBLOCK_ERROR) {
+        if (!node_pa) {
                 pr_warning("remap_alloc: failed to allocate %lu bytes for node %d\n",
                            size, nid);
                 return;
@@ -209,7 +209,7 @@ void __init init_alloc_remap(int nid, u64 start, u64 end)
         remap_pa = memblock_find_in_range(min_low_pfn << PAGE_SHIFT,
                                           max_low_pfn << PAGE_SHIFT,
                                           size, LARGE_PAGE_BYTES);
-        if (remap_pa == MEMBLOCK_ERROR) {
+        if (!remap_pa) {
                 pr_warning("remap_alloc: failed to allocate %lu bytes remap area for node %d\n",
                            size, nid);
                 memblock_x86_free_range(node_pa, node_pa + size);
diff --git a/arch/x86/mm/numa_emulation.c b/arch/x86/mm/numa_emulation.c
index d0ed086b6247..e3d471c20cdc 100644
--- a/arch/x86/mm/numa_emulation.c
+++ b/arch/x86/mm/numa_emulation.c
@@ -351,7 +351,7 @@ void __init numa_emulation(struct numa_meminfo *numa_meminfo, int numa_dist_cnt)
 
                 phys = memblock_find_in_range(0, PFN_PHYS(max_pfn_mapped),
                                               phys_size, PAGE_SIZE);
-                if (phys == MEMBLOCK_ERROR) {
+                if (!phys) {
                         pr_warning("NUMA: Warning: can't allocate copy of distance table, disabling emulation\n");
                         goto no_emu;
                 }