Commit fa7194eb authored by Yasuaki Ishimatsu's avatar Yasuaki Ishimatsu Committed by Linus Torvalds
Browse files

memory hotplug: suppress "Device memoryX does not have a release() function" warning

When calling remove_memory_block(), the function shows following message
at device_release().

"Device 'memory528' does not have a release() function, it is broken and
must be fixed."

The reason is memory_block's device struct does not have a release()

So the patch registers memory_block_release() to the device's release()
function for suppressing the warning message.  Additionally, the patch
moves kfree(mem) into the release function since the release function is
prepared as a means to free a memory_block struct.
Signed-off-by: default avatarYasuaki Ishimatsu <>
Acked-by: default avatarDavid Rientjes <>
Cc: Jiang Liu <>
Cc: Minchan Kim <>
Acked-by: default avatarKOSAKI Motohiro <>
Cc: Wen Congyang <>
Cc: Greg KH <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent b3092b3b
...@@ -70,6 +70,13 @@ void unregister_memory_isolate_notifier(struct notifier_block *nb) ...@@ -70,6 +70,13 @@ void unregister_memory_isolate_notifier(struct notifier_block *nb)
} }
EXPORT_SYMBOL(unregister_memory_isolate_notifier); EXPORT_SYMBOL(unregister_memory_isolate_notifier);
static void memory_block_release(struct device *dev)
struct memory_block *mem = container_of(dev, struct memory_block, dev);
/* /*
* register_memory - Setup a sysfs device for a memory block * register_memory - Setup a sysfs device for a memory block
*/ */
...@@ -80,6 +87,7 @@ int register_memory(struct memory_block *memory) ...@@ -80,6 +87,7 @@ int register_memory(struct memory_block *memory)
memory->dev.bus = &memory_subsys; memory->dev.bus = &memory_subsys;
memory-> = memory->start_section_nr / sections_per_block; memory-> = memory->start_section_nr / sections_per_block;
memory->dev.release = memory_block_release;
error = device_register(&memory->dev); error = device_register(&memory->dev);
return error; return error;
...@@ -635,7 +643,6 @@ int remove_memory_block(unsigned long node_id, struct mem_section *section, ...@@ -635,7 +643,6 @@ int remove_memory_block(unsigned long node_id, struct mem_section *section,
mem_remove_simple_file(mem, phys_device); mem_remove_simple_file(mem, phys_device);
mem_remove_simple_file(mem, removable); mem_remove_simple_file(mem, removable);
unregister_memory(mem); unregister_memory(mem);
} else } else
kobject_put(&mem->dev.kobj); kobject_put(&mem->dev.kobj);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment