ACPI / memhotplug: remove redundant logic of acpi memory hotadd
When memory hotadd, acpi_memory_enable_device has already been done at drv->ops.add (acpi_memory_device_add), no need to do it again at notify callback. At acpi_memory_enable_device, acpi_memory_get_device_resources is also a redundant action, since it has been done at drv->ops.add. Signed-off-by: Liu Jinsong <jinsong.liu@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
parent
6780aa683d
commit
8611ea5f5d
|
@ -226,16 +226,6 @@ static int acpi_memory_enable_device(struct acpi_memory_device *mem_device)
|
||||||
struct acpi_memory_info *info;
|
struct acpi_memory_info *info;
|
||||||
int node;
|
int node;
|
||||||
|
|
||||||
|
|
||||||
/* Get the range from the _CRS */
|
|
||||||
result = acpi_memory_get_device_resources(mem_device);
|
|
||||||
if (result) {
|
|
||||||
dev_err(&mem_device->device->dev,
|
|
||||||
"get_device_resources failed\n");
|
|
||||||
mem_device->state = MEMORY_INVALID_STATE;
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
node = acpi_get_node(mem_device->device->handle);
|
node = acpi_get_node(mem_device->device->handle);
|
||||||
/*
|
/*
|
||||||
* Tell the VM there is more memory here...
|
* Tell the VM there is more memory here...
|
||||||
|
@ -342,14 +332,6 @@ static void acpi_memory_device_notify(acpi_handle handle, u32 event, void *data)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (acpi_memory_check_device(mem_device))
|
|
||||||
break;
|
|
||||||
|
|
||||||
if (acpi_memory_enable_device(mem_device)) {
|
|
||||||
acpi_handle_err(handle,"Cannot enable memory device\n");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
ost_code = ACPI_OST_SC_SUCCESS;
|
ost_code = ACPI_OST_SC_SUCCESS;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue