iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ACPI / PM: Introduce helper for executing _PSn methods

Browse Source 
To reduce code duplication between acpi_device_set_power() and
acpi_bus_init_power(), introduce a new helper function for executing
ACPI devices' _PSn (n = 0..3) methods, acpi_dev_pm_explicit_set().

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Rafael J. Wysocki 2013-01-22 12:55:52 +01:00
parent a2367807b8
commit 9c0f45e388
1 changed files with 23 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
drivers/acpi/device_pm.c
View File

@ -186,6 +186,19 @@ int acpi_device_get_power(struct acpi_device *device, int *state)
return 0; return 0;
} }
static int acpi_dev_pm_explicit_set(struct acpi_device *adev, int state)
{
if (adev->power.states[state].flags.explicit_set) {
char method[5] = { '_', 'P', 'S', '0' + state, '\0' };
acpi_status status;
status = acpi_evaluate_object(adev->handle, method, NULL, NULL);
if (ACPI_FAILURE(status))
return -ENODEV;
}
return 0;
}
/** /**
* acpi_device_set_power - Set power state of an ACPI device. * acpi_device_set_power - Set power state of an ACPI device.
* @device: Device to set the power state of. * @device: Device to set the power state of.
@ -197,8 +210,6 @@ int acpi_device_get_power(struct acpi_device *device, int *state)
int acpi_device_set_power(struct acpi_device *device, int state) int acpi_device_set_power(struct acpi_device *device, int state)
{ {
int result = 0; int result = 0;
acpi_status status = AE_OK;
char object_name[5] = { '_', 'P', 'S', '0' + state, '\0' };
bool cut_power = false; bool cut_power = false;
if (!device || (state < ACPI_STATE_D0) || (state > ACPI_STATE_D3_COLD)) if (!device || (state < ACPI_STATE_D0) || (state > ACPI_STATE_D3_COLD))
@ -228,7 +239,6 @@ int acpi_device_set_power(struct acpi_device *device, int state)
if (state == ACPI_STATE_D3_COLD if (state == ACPI_STATE_D3_COLD
&& device->power.states[ACPI_STATE_D3_COLD].flags.os_accessible) { && device->power.states[ACPI_STATE_D3_COLD].flags.os_accessible) {
state = ACPI_STATE_D3_HOT; state = ACPI_STATE_D3_HOT;
object_name[3] = '3';
cut_power = true; cut_power = true;
} }
@ -251,23 +261,14 @@ int acpi_device_set_power(struct acpi_device *device, int state)
if (result) if (result)
goto end; goto end;
} }
if (device->power.states[state].flags.explicit_set) { result = acpi_dev_pm_explicit_set(device, state);
status = acpi_evaluate_object(device->handle, if (result)
object_name, NULL, NULL); goto end;
if (ACPI_FAILURE(status)) {
result = -ENODEV;
goto end;
}
}
} else { } else {
if (device->power.states[state].flags.explicit_set) { result = acpi_dev_pm_explicit_set(device, state);
status = acpi_evaluate_object(device->handle, if (result)
object_name, NULL, NULL); goto end;
if (ACPI_FAILURE(status)) {
result = -ENODEV;
goto end;
}
}
if (device->power.flags.power_resources) { if (device->power.flags.power_resources) {
result = acpi_power_transition(device, state); result = acpi_power_transition(device, state);
if (result) if (result)
@ -335,15 +336,9 @@ int acpi_bus_init_power(struct acpi_device *device)
if (result) if (result)
return result; return result;
if (device->power.states[state].flags.explicit_set) { result = acpi_dev_pm_explicit_set(device, state);
char method[5] = { '_', 'P', 'S', '0' + state, '\0' }; if (result)
acpi_status status; return result;
status = acpi_evaluate_object(device->handle, method,
NULL, NULL);
if (ACPI_FAILURE(status))
return -ENODEV;
}
} }
device->power.state = state; device->power.state = state;
return 0; return 0;