aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/memory.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 7a1390cd6aad..c41d0728efe2 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -238,7 +238,7 @@ store_mem_state(struct sys_device *dev, const char *buf, size_t count)
238 mem = container_of(dev, struct memory_block, sysdev); 238 mem = container_of(dev, struct memory_block, sysdev);
239 phys_section_nr = mem->phys_index; 239 phys_section_nr = mem->phys_index;
240 240
241 if (!valid_section_nr(phys_section_nr)) 241 if (!present_section_nr(phys_section_nr))
242 goto out; 242 goto out;
243 243
244 if (!strncmp(buf, "online", min((int)count, 6))) 244 if (!strncmp(buf, "online", min((int)count, 6)))
@@ -418,7 +418,7 @@ int register_new_memory(struct mem_section *section)
418 418
419int unregister_memory_section(struct mem_section *section) 419int unregister_memory_section(struct mem_section *section)
420{ 420{
421 if (!valid_section(section)) 421 if (!present_section(section))
422 return -EINVAL; 422 return -EINVAL;
423 423
424 return remove_memory_block(0, section, 0); 424 return remove_memory_block(0, section, 0);
@@ -443,7 +443,7 @@ int __init memory_dev_init(void)
443 * during boot and have been initialized 443 * during boot and have been initialized
444 */ 444 */
445 for (i = 0; i < NR_MEM_SECTIONS; i++) { 445 for (i = 0; i < NR_MEM_SECTIONS; i++) {
446 if (!valid_section_nr(i)) 446 if (!present_section_nr(i))
447 continue; 447 continue;
448 err = add_memory_block(0, __nr_to_section(i), MEM_ONLINE, 0); 448 err = add_memory_block(0, __nr_to_section(i), MEM_ONLINE, 0);
449 if (!ret) 449 if (!ret)