From: Miaohe Lin Date: Thu, 17 Feb 2022 14:07:54 +0000 (+0800) Subject: memblock: __next_mem_pfn_range_in_zone: remove unneeded local variable nid X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f30b002ccfee8c60c8feb590e145c0b5e8fa4c67;p=linux.git 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 [rppt: updated the commit message] Signed-off-by: Mike Rapoport --- diff --git a/mm/memblock.c b/mm/memblock.c index 1018e50566f35..11561bbff8f5f 100644 --- 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 */