diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-07-30 14:36:20 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-07-30 14:36:20 +0200 |
commit | 8ad928d52e63a9b7d69f0873d7318c4561e2f8cd (patch) | |
tree | 35f0ed4a4d9da2953fe56949a25d66250ecd8832 /drivers/ide | |
parent | ACPI / PM: Make messages in acpi_device_set_power() print device names (diff) | |
download | linux-8ad928d52e63a9b7d69f0873d7318c4561e2f8cd.tar.xz linux-8ad928d52e63a9b7d69f0873d7318c4561e2f8cd.zip |
ACPI / PM: Use ACPI_STATE_D3_COLD instead of ACPI_STATE_D3 everywhere
There are several places in the tree where ACPI_STATE_D3 is used
instead of ACPI_STATE_D3_COLD which should be used instead for
clarity. Modify them all to use ACPI_STATE_D3_COLD as appropriate.
[The definition of ACPI_STATE_D3 itself cannot go away at this point
as it is part of ACPICA.]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Aaron Lu <aaron.lu@intel.com>
Diffstat (limited to 'drivers/ide')
-rw-r--r-- | drivers/ide/ide-acpi.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/ide/ide-acpi.c b/drivers/ide/ide-acpi.c index f1a6796b165c..140c8ef50529 100644 --- a/drivers/ide/ide-acpi.c +++ b/drivers/ide/ide-acpi.c @@ -520,11 +520,12 @@ void ide_acpi_set_state(ide_hwif_t *hwif, int on) ide_port_for_each_present_dev(i, drive, hwif) { if (drive->acpidata->obj_handle) acpi_bus_set_power(drive->acpidata->obj_handle, - on ? ACPI_STATE_D0 : ACPI_STATE_D3); + on ? ACPI_STATE_D0 : ACPI_STATE_D3_COLD); } if (!on) - acpi_bus_set_power(hwif->acpidata->obj_handle, ACPI_STATE_D3); + acpi_bus_set_power(hwif->acpidata->obj_handle, + ACPI_STATE_D3_COLD); } /** |