mm: use pgdat_end_pfn() to simplify the code in others

Use "pgdat_end_pfn()" instead of "pgdat->node_start_pfn +
pgdat->node_spanned_pages".  Simplify the code, no functional change.

Signed-off-by: Xishi Qiu <qiuxishi@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 4 insertions, 5 deletions

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index ed85fe3870e2..375a42d76b2c 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -365,8 +365,7 @@ out_fail:
 static void grow_pgdat_span(struct pglist_data *pgdat, unsigned long start_pfn,
                             unsigned long end_pfn)
 {
-        unsigned long old_pgdat_end_pfn =
-                pgdat->node_start_pfn + pgdat->node_spanned_pages;
+        unsigned long old_pgdat_end_pfn = pgdat_end_pfn(pgdat);
 
         if (!pgdat->node_spanned_pages || start_pfn < pgdat->node_start_pfn)
                 pgdat->node_start_pfn = start_pfn;
@@ -579,9 +578,9 @@ static void shrink_zone_span(struct zone *zone, unsigned long start_pfn,
 static void shrink_pgdat_span(struct pglist_data *pgdat,
                               unsigned long start_pfn, unsigned long end_pfn)
 {
-        unsigned long pgdat_start_pfn =  pgdat->node_start_pfn;
-        unsigned long pgdat_end_pfn =
-                pgdat->node_start_pfn + pgdat->node_spanned_pages;
+        unsigned long pgdat_start_pfn = pgdat->node_start_pfn;
+        unsigned long p = pgdat_end_pfn(pgdat); /* pgdat_end_pfn namespace clash */
+        unsigned long pgdat_end_pfn = p;
         unsigned long pfn;
         struct mem_section *ms;
         int nid = pgdat->node_id;