drivers/base/memory.c: clean up relics in function parameters

BugLink: https://bugs.launchpad.net/bugs/1864261
commit 063b8a4cee8088224bcdb79bcd08db98df16178e upstream.

The input parameter 'phys_index' of memory_block_action() is actually the
section number, but not the phys_index of memory_block.  This is a relic
from the past when one memory block could only contain one section.
Rename it to start_section_nr.

And also in remove_memory_section(), the 'node_id' and 'phys_device'
arguments are not used by anyone.  Remove them.

Link: http://lkml.kernel.org/r/20190329144250.14315-2-bhe@redhat.com
Signed-off-by: Baoquan He <bhe@redhat.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Mukesh Ojha <mojha@codeaurora.org>
Reviewed-by: Oscar Salvador <osalvador@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>

diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 680fea750d91d71afac708fec3399abb1f0dfa93..8300af3c5bc1508d9b12360b96fae3171409a295 100644 (file)
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -226,13 +226,14 @@ static bool pages_correctly_reserved(unsigned long start_pfn)
  * OK to have direct references to sparsemem variables in here.
  */
 static int
-memory_block_action(unsigned long phys_index, unsigned long action, int online_type)
+memory_block_action(unsigned long start_section_nr, unsigned long action,
+                   int online_type)
 {
        unsigned long start_pfn;
        unsigned long nr_pages = PAGES_PER_SECTION * sections_per_block;
        int ret;
 
-       start_pfn = section_nr_to_pfn(phys_index);
+       start_pfn = section_nr_to_pfn(start_section_nr);
 
        switch (action) {
        case MEM_ONLINE:
@@ -246,7 +247,7 @@ memory_block_action(unsigned long phys_index, unsigned long action, int online_t
                break;
        default:
                WARN(1, KERN_WARNING "%s(%ld, %ld) unknown action: "
-                    "%ld\n", __func__, phys_index, action, action);
+                    "%ld\n", __func__, start_section_nr, action, action);
                ret = -EINVAL;
        }
 
@@ -741,8 +742,7 @@ unregister_memory(struct memory_block *memory)
        device_unregister(&memory->dev);
 }
 
-static int remove_memory_section(unsigned long node_id,
-                              struct mem_section *section, int phys_device)
+static int remove_memory_section(struct mem_section *section)
 {
        struct memory_block *mem;
 
@@ -774,7 +774,7 @@ int unregister_memory_section(struct mem_section *section)
        if (!present_section(section))
                return -EINVAL;
 
-       return remove_memory_section(0, section, 0);
+       return remove_memory_section(section);
 }
 #endif /* CONFIG_MEMORY_HOTREMOVE */