arch, drivers: replace for_each_membock() with for_each_mem_range()

[linux-2.6-microblaze.git] / drivers / bus / mvebu-mbus.c

diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c
index 5b2a11a..2519cee 100644 (file)
--- a/drivers/bus/mvebu-mbus.c
+++ b/drivers/bus/mvebu-mbus.c
@@ -610,23 +610,23 @@ static unsigned int armada_xp_mbus_win_remap_offset(int win)
 static void __init
 mvebu_mbus_find_bridge_hole(uint64_t *start, uint64_t *end)
 {
-       struct memblock_region *r;
-       uint64_t s = 0;
+       phys_addr_t reg_start, reg_end;
+       uint64_t i, s = 0;
 
-       for_each_memblock(memory, r) {
+       for_each_mem_range(i, &reg_start, &reg_end) {
                /*
                 * This part of the memory is above 4 GB, so we don't
                 * care for the MBus bridge hole.
                 */
-               if (r->base >= 0x100000000ULL)
+               if (reg_start >= 0x100000000ULL)
                        continue;
 
                /*
                 * The MBus bridge hole is at the end of the RAM under
                 * the 4 GB limit.
                 */
-               if (r->base + r->size > s)
-                       s = r->base + r->size;
+               if (reg_end > s)
+                       s = reg_end;
        }
 
        *start = s;