From: Seth Jennings <sjennings@variantweb.net>
Date: Thu, 14 Jan 2016 23:20:24 +0000 (-0800)
Subject: drivers/base/memory.c: rename remove_memory_block() to remove_memory_section()
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=cc292b0b43027cce9310a18ec3239b5e9b4ea301;p=openwrt%2Fstaging%2Fblogic.git

drivers/base/memory.c: rename remove_memory_block() to remove_memory_section()

The function removes a section, not a block.  Rename to reflect actual
functionality.

Signed-off-by: Seth Jennings <sjennings@variantweb.net>
Cc: Andrew Banman <abanman@sgi.com>
Cc: Daniel J Blueman <daniel@numascale.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Greg KH <greg@kroah.com>
Cc: Russ Anderson <rja@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 17173f655f89..6d7b14c2798e 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -692,7 +692,7 @@ unregister_memory(struct memory_block *memory)
 	device_unregister(&memory->dev);
 }
 
-static int remove_memory_block(unsigned long node_id,
+static int remove_memory_section(unsigned long node_id,
 			       struct mem_section *section, int phys_device)
 {
 	struct memory_block *mem;
@@ -716,7 +716,7 @@ int unregister_memory_section(struct mem_section *section)
 	if (!present_section(section))
 		return -EINVAL;
 
-	return remove_memory_block(0, section, 0);
+	return remove_memory_section(0, section, 0);
 }
 #endif /* CONFIG_MEMORY_HOTREMOVE */