From: Andrew Morton Signed-off-by: Andrew Morton --- drivers/acpi/acpi_memhotplug.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff -puN drivers/acpi/acpi_memhotplug.c~git-acpi-fixup drivers/acpi/acpi_memhotplug.c --- a/drivers/acpi/acpi_memhotplug.c~git-acpi-fixup +++ a/drivers/acpi/acpi_memhotplug.c @@ -128,8 +128,6 @@ acpi_memory_get_device_resources(struct acpi_status status; struct acpi_memory_info *info, *n; - ACPI_FUNCTION_TRACE("acpi_memory_get_device_resources"); - status = acpi_walk_resources(mem_device->handle, METHOD_NAME__CRS, acpi_memory_get_resource, mem_device); if (ACPI_FAILURE(status)) { @@ -203,9 +201,9 @@ static int acpi_memory_check_device(stru if (!((current_status & ACPI_MEMORY_STA_PRESENT) && (current_status & ACPI_MEMORY_STA_ENABLED) && (current_status & ACPI_MEMORY_STA_FUNCTIONAL))) - return_VALUE(-ENODEV); + return -ENODEV; - return_VALUE(0); + return 0; } static int acpi_memory_enable_device(struct acpi_memory_device *mem_device) @@ -214,13 +212,10 @@ static int acpi_memory_enable_device(str struct acpi_memory_info *info; int node; - ACPI_FUNCTION_TRACE("acpi_memory_enable_device"); - /* Get the range from the _CRS */ result = acpi_memory_get_device_resources(mem_device); if (result) { - ACPI_DEBUG_PRINT((ACPI_DB_ERROR, - "\nget_device_resources failed\n")); + printk(KERN_ERR PREFIX "get_device_resources failed\n"); mem_device->state = MEMORY_INVALID_STATE; return result; } @@ -251,7 +246,7 @@ static int acpi_memory_enable_device(str num_enabled++; } if (!num_enabled) { - ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "\nadd_memory failed\n")); + printk(KERN_ERR PREFIX "add_memory failed\n"); mem_device->state = MEMORY_INVALID_STATE; return -EINVAL; } @@ -298,8 +293,6 @@ static int acpi_memory_disable_device(st int result; struct acpi_memory_info *info, *n; - ACPI_FUNCTION_TRACE("acpi_memory_disable_device"); - /* * Ask the VM to offline this memory range. * Note: Assume that this function returns zero on success @@ -316,8 +309,6 @@ static int acpi_memory_disable_device(st /* Power-off and eject the device */ result = acpi_memory_powerdown_device(mem_device); if (result) { - ACPI_DEBUG_PRINT((ACPI_DB_ERROR, - "Device Power Down failed.\n")); /* Set the status of the device to invalid */ mem_device->state = MEMORY_INVALID_STATE; return result; @@ -443,8 +434,6 @@ static int acpi_memory_device_start (str struct acpi_memory_device *mem_device; int result = 0; - ACPI_FUNCTION_TRACE("acpi_memory_device_start"); - mem_device = acpi_driver_data(device); if (!acpi_memory_check_device(mem_device)) { @@ -454,7 +443,7 @@ static int acpi_memory_device_start (str ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error in acpi_memory_enable_device\n")); } - return_VALUE(result); + return result; } /* _