diff options
Diffstat (limited to 'drivers/acpi/acpi_memhotplug.c')
| -rw-r--r-- | drivers/acpi/acpi_memhotplug.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c index eb30e5ab4cab..b679bf8478f7 100644 --- a/drivers/acpi/acpi_memhotplug.c +++ b/drivers/acpi/acpi_memhotplug.c | |||
| @@ -226,16 +226,6 @@ static int acpi_memory_enable_device(struct acpi_memory_device *mem_device) | |||
| 226 | struct acpi_memory_info *info; | 226 | struct acpi_memory_info *info; |
| 227 | int node; | 227 | int node; |
| 228 | 228 | ||
| 229 | |||
| 230 | /* Get the range from the _CRS */ | ||
| 231 | result = acpi_memory_get_device_resources(mem_device); | ||
| 232 | if (result) { | ||
| 233 | dev_err(&mem_device->device->dev, | ||
| 234 | "get_device_resources failed\n"); | ||
| 235 | mem_device->state = MEMORY_INVALID_STATE; | ||
| 236 | return result; | ||
| 237 | } | ||
| 238 | |||
| 239 | node = acpi_get_node(mem_device->device->handle); | 229 | node = acpi_get_node(mem_device->device->handle); |
| 240 | /* | 230 | /* |
| 241 | * Tell the VM there is more memory here... | 231 | * 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) | |||
| 342 | break; | 332 | break; |
| 343 | } | 333 | } |
| 344 | 334 | ||
| 345 | if (acpi_memory_check_device(mem_device)) | ||
| 346 | break; | ||
| 347 | |||
| 348 | if (acpi_memory_enable_device(mem_device)) { | ||
| 349 | acpi_handle_err(handle,"Cannot enable memory device\n"); | ||
| 350 | break; | ||
| 351 | } | ||
| 352 | |||
| 353 | ost_code = ACPI_OST_SC_SUCCESS; | 335 | ost_code = ACPI_OST_SC_SUCCESS; |
| 354 | break; | 336 | break; |
| 355 | 337 | ||
