ARM: dts: vf610: add remaining SAI instaces

[karo-tx-linux.git] / mm / memblock.c

diff --git a/mm/memblock.c b/mm/memblock.c
index 07ff069fef256055f776803c708754db310d74f2..d2ed81e59a94c3f81674ead9e84d51ca8ebd9950 100644 (file)
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -96,13 +96,10 @@ bool __init_memblock memblock_overlaps_region(struct memblock_type *type,
 {
        unsigned long i;
 
-       for (i = 0; i < type->cnt; i++) {
-               phys_addr_t rgnbase = type->regions[i].base;
-               phys_addr_t rgnsize = type->regions[i].size;
-               if (memblock_addrs_overlap(base, size, rgnbase, rgnsize))
+       for (i = 0; i < type->cnt; i++)
+               if (memblock_addrs_overlap(base, size, type->regions[i].base,
+                                          type->regions[i].size))
                        break;
-       }
-
        return i < type->cnt;
 }
 
@@ -528,7 +525,8 @@ int __init_memblock memblock_add_range(struct memblock_type *type,
        bool insert = false;
        phys_addr_t obase = base;
        phys_addr_t end = base + memblock_cap_size(base, &size);
-       int i, nr_new;
+       int idx, nr_new;
+       struct memblock_region *rgn;
 
        if (!size)
                return 0;
@@ -552,8 +550,7 @@ repeat:
        base = obase;
        nr_new = 0;
 
-       for (i = 0; i < type->cnt; i++) {
-               struct memblock_region *rgn = &type->regions[i];
+       for_each_memblock_type(type, rgn) {
                phys_addr_t rbase = rgn->base;
                phys_addr_t rend = rbase + rgn->size;
 
@@ -572,7 +569,7 @@ repeat:
                        WARN_ON(flags != rgn->flags);
                        nr_new++;
                        if (insert)
-                               memblock_insert_region(type, i++, base,
+                               memblock_insert_region(type, idx++, base,
                                                       rbase - base, nid,
                                                       flags);
                }
@@ -584,7 +581,7 @@ repeat:
        if (base < end) {
                nr_new++;
                if (insert)
-                       memblock_insert_region(type, i, base, end - base,
+                       memblock_insert_region(type, idx, base, end - base,
                                               nid, flags);
        }
 
@@ -651,7 +648,8 @@ static int __init_memblock memblock_isolate_range(struct memblock_type *type,
                                        int *start_rgn, int *end_rgn)
 {
        phys_addr_t end = base + memblock_cap_size(base, &size);
-       int i;
+       int idx;
+       struct memblock_region *rgn;
 
        *start_rgn = *end_rgn = 0;
 
@@ -663,8 +661,7 @@ static int __init_memblock memblock_isolate_range(struct memblock_type *type,
                if (memblock_double_array(type, base, size) < 0)
                        return -ENOMEM;
 
-       for (i = 0; i < type->cnt; i++) {
-               struct memblock_region *rgn = &type->regions[i];
+       for_each_memblock_type(type, rgn) {
                phys_addr_t rbase = rgn->base;
                phys_addr_t rend = rbase + rgn->size;
 
@@ -681,7 +678,7 @@ static int __init_memblock memblock_isolate_range(struct memblock_type *type,
                        rgn->base = base;
                        rgn->size -= base - rbase;
                        type->total_size -= base - rbase;
-                       memblock_insert_region(type, i, rbase, base - rbase,
+                       memblock_insert_region(type, idx, rbase, base - rbase,
                                               memblock_get_region_node(rgn),
                                               rgn->flags);
                } else if (rend > end) {
@@ -692,14 +689,14 @@ static int __init_memblock memblock_isolate_range(struct memblock_type *type,
                        rgn->base = end;
                        rgn->size -= end - rbase;
                        type->total_size -= end - rbase;
-                       memblock_insert_region(type, i--, rbase, end - rbase,
+                       memblock_insert_region(type, idx--, rbase, end - rbase,
                                               memblock_get_region_node(rgn),
                                               rgn->flags);
                } else {
                        /* @rgn is fully contained, record it */
                        if (!*end_rgn)
-                               *start_rgn = i;
-                       *end_rgn = i + 1;
+                               *start_rgn = idx;
+                       *end_rgn = idx + 1;
                }
        }
 
@@ -1528,12 +1525,12 @@ static int __init_memblock memblock_search(struct memblock_type *type, phys_addr
        return -1;
 }
 
-int __init memblock_is_reserved(phys_addr_t addr)
+bool __init memblock_is_reserved(phys_addr_t addr)
 {
        return memblock_search(&memblock.reserved, addr) != -1;
 }
 
-int __init_memblock memblock_is_memory(phys_addr_t addr)
+bool __init_memblock memblock_is_memory(phys_addr_t addr)
 {
        return memblock_search(&memblock.memory, addr) != -1;
 }
@@ -1641,12 +1638,12 @@ static void __init_memblock memblock_dump(struct memblock_type *type, char *name
 {
        unsigned long long base, size;
        unsigned long flags;
-       int i;
+       int idx;
+       struct memblock_region *rgn;
 
        pr_info(" %s.cnt  = 0x%lx\n", name, type->cnt);
 
-       for (i = 0; i < type->cnt; i++) {
-               struct memblock_region *rgn = &type->regions[i];
+       for_each_memblock_type(type, rgn) {
                char nid_buf[32] = "";
 
                base = rgn->base;
@@ -1658,7 +1655,7 @@ static void __init_memblock memblock_dump(struct memblock_type *type, char *name
                                 memblock_get_region_node(rgn));
 #endif
                pr_info(" %s[%#x]\t[%#016llx-%#016llx], %#llx bytes%s flags: %#lx\n",
-                       name, i, base, base + size - 1, size, nid_buf, flags);
+                       name, idx, base, base + size - 1, size, nid_buf, flags);
        }
 }