summaryrefslogtreecommitdiffstats
path: root/mm/memory_hotplug.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-05-23 10:41:50 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-06-01 21:37:10 +0200
commitea50be59345a2b714fd3ed43e1bba89906c177c3 (patch)
treec0c4b5def84b9b03143cdd2bd28e15b7632038b9 /mm/memory_hotplug.c
parentACPI / processor: Pass processor object handle to acpi_bind_one() (diff)
downloadlinux-ea50be59345a2b714fd3ed43e1bba89906c177c3.tar.xz
linux-ea50be59345a2b714fd3ed43e1bba89906c177c3.zip
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>
Diffstat (limited to 'mm/memory_hotplug.c')
-rw-r--r--mm/memory_hotplug.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index 5ea1287ee91f..a39841d240e8 100644
--- 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;