From bd88c4172bc923de885e0ebfa5cae00165ad3f7b Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Sat, 9 Feb 2013 15:29:20 +0100 Subject: [PATCH] --- yaml --- r: 350981 b: refs/heads/master c: 0aa120a0138398d6597350f4c1dcb46d14be1a0b h: refs/heads/master i: 350979: 4e4d7a06500fef0bf2a3f73b4a54214a2aa6ee2f v: v3 --- [refs] | 2 +- trunk/drivers/acpi/scan.c | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index afc9e8f630e9..295792af6031 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f058cdf4cf3e5181172455f90fc73f2127b6ddf8 +refs/heads/master: 0aa120a0138398d6597350f4c1dcb46d14be1a0b diff --git a/trunk/drivers/acpi/scan.c b/trunk/drivers/acpi/scan.c index 75fb14fc19e8..c7676ee8eca4 100644 --- a/trunk/drivers/acpi/scan.c +++ b/trunk/drivers/acpi/scan.c @@ -125,12 +125,6 @@ void acpi_bus_hot_remove_device(void *context) /* Device node has been released. */ device = NULL; - /* power off device */ - status = acpi_evaluate_object(handle, "_PS3", NULL, NULL); - if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) - printk(KERN_WARNING PREFIX - "Power-off device failed\n"); - if (ACPI_SUCCESS(acpi_get_handle(handle, "_LCK", &temp))) { arg_list.count = 1; arg_list.pointer = &arg; @@ -780,10 +774,11 @@ static void acpi_device_unregister(struct acpi_device *device) device_del(&device->dev); /* - * Drop the reference counts of all power resources the device depends - * on and turn off the ones that have no more references. + * Transition the device to D3cold to drop the reference counts of all + * power resources the device depends on and turn off the ones that have + * no more references. */ - acpi_power_transition(device, ACPI_STATE_D3_COLD); + acpi_device_set_power(device, ACPI_STATE_D3_COLD); put_device(&device->dev); }