mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-03 15:47:36 +00:00
Code Issues Releases Wiki Activity

ACPI: power: add struct acpi_device to struct acpi_power_resource

Browse source 
- Use it instead of acpi_bus_get_device() where we can..

Signed-off-by: Patrick Mochel <mochel@linux.intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Patrick Mochel 2006-05-19 16:54:40 -04:00 committed by Len Brown
parent 8348e1b19a
commit 4159857288
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/acpi/power.c
View file

@ -71,6 +71,7 @@ static struct acpi_driver acpi_power_driver = {
struct acpi_power_resource { struct acpi_power_resource {
acpi_handle handle; acpi_handle handle;
struct acpi_device * device;
acpi_bus_id name; acpi_bus_id name;
u32 system_level; u32 system_level;
u32 order; u32 order;
@ -203,10 +204,8 @@ static int acpi_power_on(acpi_handle handle)
return -ENOEXEC; return -ENOEXEC;
/* Update the power resource's _device_ power state */ /* Update the power resource's _device_ power state */
result = acpi_bus_get_device(resource->handle, &device); device = resource->device;
if (result) resource->device->power.state = ACPI_STATE_D0;
return result;
device->power.state = ACPI_STATE_D0;
ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Resource [%s] turned on\n", ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Resource [%s] turned on\n",
resource->name)); resource->name));
@ -253,9 +252,7 @@ static int acpi_power_off_device(acpi_handle handle)
return -ENOEXEC; return -ENOEXEC;
/* Update the power resource's _device_ power state */ /* Update the power resource's _device_ power state */
result = acpi_bus_get_device(resource->handle, &device); device = resource->device;
if (result)
return result;
device->power.state = ACPI_STATE_D3; device->power.state = ACPI_STATE_D3;
ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Resource [%s] turned off\n", ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Resource [%s] turned off\n",
@ -545,6 +542,7 @@ static int acpi_power_add(struct acpi_device *device)
memset(resource, 0, sizeof(struct acpi_power_resource)); memset(resource, 0, sizeof(struct acpi_power_resource));
resource->handle = device->handle; resource->handle = device->handle;
resource->device = device;
strcpy(resource->name, device->pnp.bus_id); strcpy(resource->name, device->pnp.bus_id);
strcpy(acpi_device_name(device), ACPI_POWER_DEVICE_NAME); strcpy(acpi_device_name(device), ACPI_POWER_DEVICE_NAME);
strcpy(acpi_device_class(device), ACPI_POWER_CLASS); strcpy(acpi_device_class(device), ACPI_POWER_CLASS);