Commit 063b8a4c authored by Baoquan He's avatar Baoquan He Committed by Linus Torvalds
Browse files

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

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: default avatarBaoquan He <bhe@redhat.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Reviewed-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarMukesh Ojha <mojha@codeaurora.org>
Reviewed-by: default avatarOscar Salvador <osalvador@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7567cfc5

drivers/base/memory.c

+6 −6
Original line number Diff line number Diff line
@@ -231,13 +231,14 @@ static bool pages_correctly_probed(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:
@@ -251,7 +252,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;

	}
@@ -738,8 +739,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;
@@ -771,7 +771,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 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE