Skip to contentSkip to conversation

mm/sparse: Clean up the obsolete code comment

PATCH New Baoquan He 1 participant 2 messages Mar 29, 2019

Subsystems (4)
Memory management MM core Driver core Memory hot(un)plug
lore
Share & tools
lore

Baoquan He

author
#0 lore raw

PATCH v4 1/2 mm/sparse: Clean up the obsolete code comment

The code comment above sparse_add_one_section() is obsolete and incorrect, clean it up and write new one.

Signed-off-by Baoquan He <[email protected]>
Acked-by Michal Hocko <[email protected]>
Reviewed-by Oscar Salvador <[email protected]>
Reviewed-by Mukesh Ojha <[email protected]>
Reviewed-by Mike Rapoport <[email protected]>

---
v3->v4:
Improve the doc format further.

 mm/sparse.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)
mm/sparse.c +12 -4
index 69904aa6165b..cb448c8bb46c 100644
@@ -684,10 +684,18 @@ static void free_map_bootmem(struct page *memmap)
 #endif /* CONFIG_MEMORY_HOTREMOVE */
 #endif /* CONFIG_SPARSEMEM_VMEMMAP */
 
-/*
- * returns the number of sections whose mem_maps were properly
- * set.  If this is <=0, then that means that the passed-in
- * map was not consumed and must be freed.
+/**
+ * sparse_add_one_section - add a memory section
+ * @nid: The node to add section on
+ * @start_pfn: start pfn of the memory range
+ * @altmap: device page map
+ *
+ * This is only intended for hotplug.
+ *
+ * Return:
+ * * 0		- On success.
+ * * -EEXIST	- Section has been present.
+ * * -ENOMEM	- Out of memory.
  */
 int __meminit sparse_add_one_section(int nid, unsigned long start_pfn,
 				     struct vmem_altmap *altmap)
Signature · 1 line
2.17.2
author
#1 lore raw

PATCH v4 2/2 drivers/base/memory.c: Clean up relicts 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 relict 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' are not used by anyone. Remove them.

Signed-off-by Baoquan He <[email protected]>
Acked-by Michal Hocko <[email protected]>
Reviewed-by Rafael J. Wysocki <[email protected]>
Reviewed-by Mukesh Ojha <[email protected]>
Reviewed-by Oscar Salvador <[email protected]>

---
v3->v4:
Remove useless parameters in remove_memory_section().

 drivers/base/memory.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/base/memory.c +6 -6
index cb8347500ce2..d9ebb89816f7 100644
@@ -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 */
Signature · 1 line
2.17.2