Driver core / MM: Drop offline_memory_block()

Since offline_memory_block(mem) is functionally equivalent to
device_offline(&mem->dev), make the only caller of the former use
the latter instead and drop offline_memory_block() entirely.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Toshi Kani <toshi.kani@hp.com>

diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index c7092bc3c01ecafa98ef8bbfe714eacb4159af72..4ebf97f99fae0f84fb7d8f28bc9a9bd513f7b5aa 100644 (file)
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -728,27 +728,6 @@ int unregister_memory_section(struct mem_section *section)
 }
 #endif /* CONFIG_MEMORY_HOTREMOVE */
 
-/*
- * offline one memory block. If the memory block has been offlined, do nothing.
- *
- * Call under device_hotplug_lock.
- */
-int offline_memory_block(struct memory_block *mem)
-{
-       int ret = 0;
-
-       mutex_lock(&mem->state_mutex);
-       if (mem->state != MEM_OFFLINE) {
-               ret = __memory_block_change_state_uevent(mem, MEM_OFFLINE,
-                                                        MEM_ONLINE, -1);
-               if (!ret)
-                       mem->dev.offline = true;
-       }
-       mutex_unlock(&mem->state_mutex);
-
-       return ret;
-}
-
 /* return true if the memory block is offlined, otherwise, return false */
 bool is_memblock_offlined(struct memory_block *mem)
 {

diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h
index 2975b7b2a9d8f0df95cd947ffa98e281bef1c2d5..ae5480a00963cd6dbc737eefb2d34e3a49a82a92 100644 (file)
--- a/include/linux/memory_hotplug.h
+++ b/include/linux/memory_hotplug.h
@@ -251,7 +251,6 @@ extern int mem_online_node(int nid);
 extern int add_memory(int nid, u64 start, u64 size);
 extern int arch_add_memory(int nid, u64 start, u64 size);
 extern int offline_pages(unsigned long start_pfn, unsigned long nr_pages);
-extern int offline_memory_block(struct memory_block *mem);
 extern bool is_memblock_offlined(struct memory_block *mem);
 extern int remove_memory(int nid, u64 start, u64 size);
 extern int sparse_add_one_section(struct zone *zone, unsigned long start_pfn,

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index 5ea1287ee91f287d970da1a8dfc62e15ea3664a7..a39841d240e8b21e07c36f094c3e3756cb93ccc6 100644 (file)
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -1680,7 +1680,7 @@ int walk_memory_range(unsigned long start_pfn, unsigned long end_pfn,
 static int offline_memory_block_cb(struct memory_block *mem, void *arg)
 {
        int *ret = arg;
-       int error = offline_memory_block(mem);
+       int error = device_offline(&mem->dev);
 
        if (error != 0 && *ret == 0)
                *ret = error;