diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-17 14:11:06 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-17 14:11:06 +0100 |
| commit | 722c929f32616943d2b67332068f09c08e81eec8 (patch) | |
| tree | 7554d567de4b293c691797853968515d2f7d07ef /drivers/acpi/power.c | |
| parent | 781d737c7466845035e5ce02885c7436b5278b90 (diff) | |
ACPI: Do not use device power states of power resources
ACPI power resource objects have struct acpi_device components, but
they are only used for registering those resources in the device
hierarchy. In particular, power state information stored in them is
completely useless (amnong other things, because the power resources
"devices" are not power manageable), so there is no reason for the
power resources management code to keep it up to date.
Remove the code updating device power states of power resources from
drivers/acpi/power.c.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/power.c')
| -rw-r--r-- | drivers/acpi/power.c | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c index 29803857a2ef..06ad05288af8 100644 --- a/drivers/acpi/power.c +++ b/drivers/acpi/power.c @@ -193,9 +193,6 @@ static int __acpi_power_on(struct acpi_power_resource *resource) if (ACPI_FAILURE(status)) return -ENODEV; - /* Update the power resource's _device_ power state */ - resource->device.power.state = ACPI_STATE_D0; - ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Power resource [%s] turned on\n", resource->name)); @@ -261,16 +258,12 @@ static int acpi_power_off(acpi_handle handle) } status = acpi_evaluate_object(resource->device.handle, "_OFF", NULL, NULL); - if (ACPI_FAILURE(status)) { + if (ACPI_FAILURE(status)) result = -ENODEV; - } else { - /* Update the power resource's _device_ power state */ - resource->device.power.state = ACPI_STATE_D3; - + else ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Power resource [%s] turned off\n", resource->name)); - } unlock: mutex_unlock(&resource->resource_lock); @@ -659,6 +652,7 @@ void acpi_add_power_resource(acpi_handle handle) resource->name = device->pnp.bus_id; strcpy(acpi_device_name(device), ACPI_POWER_DEVICE_NAME); strcpy(acpi_device_class(device), ACPI_POWER_CLASS); + device->power.state = ACPI_STATE_UNKNOWN; /* Evalute the object to get the system level and resource order. */ status = acpi_evaluate_object(handle, NULL, NULL, &buffer); @@ -672,17 +666,6 @@ void acpi_add_power_resource(acpi_handle handle) if (result) goto err; - switch (state) { - case ACPI_POWER_RESOURCE_STATE_ON: - device->power.state = ACPI_STATE_D0; - break; - case ACPI_POWER_RESOURCE_STATE_OFF: - device->power.state = ACPI_STATE_D3; - break; - default: - device->power.state = ACPI_STATE_UNKNOWN; - } - printk(KERN_INFO PREFIX "%s [%s] (%s)\n", acpi_device_name(device), acpi_device_bid(device), state ? "on" : "off"); |