memblock: __next_mem_pfn_range_in_zone: remove unneeded local variable nid

The nid is only used to act as output parameter of __next_mem_range.
Since NULL can be passed to __next_mem_range as out_nid, we can thus
remove nid by passing NULL here.

Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
[rppt: updated the commit message]
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>

diff --git a/mm/memblock.c b/mm/memblock.c
index 1018e50566f35a28f07596fdc06da73fd7c28efc..11561bbff8f5f06570f10da45e8ac28cfe173b00 100644 (file)
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -1278,11 +1278,10 @@ __next_mem_pfn_range_in_zone(u64 *idx, struct zone *zone,
 {
        int zone_nid = zone_to_nid(zone);
        phys_addr_t spa, epa;
-       int nid;
 
        __next_mem_range(idx, zone_nid, MEMBLOCK_NONE,
                         &memblock.memory, &memblock.reserved,
-                        &spa, &epa, &nid);
+                        &spa, &epa, NULL);
 
        while (*idx != U64_MAX) {
                unsigned long epfn = PFN_DOWN(epa);
@@ -1309,7 +1308,7 @@ __next_mem_pfn_range_in_zone(u64 *idx, struct zone *zone,
 
                __next_mem_range(idx, zone_nid, MEMBLOCK_NONE,
                                 &memblock.memory, &memblock.reserved,
-                                &spa, &epa, &nid);
+                                &spa, &epa, NULL);
        }
 
        /* signal end of iteration */