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>

diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index 5b02a0aa540cfa122ecfd8481d38162076cefbde..41ade6570bc07c22c3c40445d696aea26e4e4c41 100644 (file)
--- a/drivers/acpi/fan.c
+++ b/drivers/acpi/fan.c
@@ -93,7 +93,7 @@ static int fan_get_cur_state(struct thermal_cooling_device *cdev, unsigned long
        if (result)
                return result;
 
-       *state = (acpi_state == ACPI_STATE_D3 ? 0 :
+       *state = (acpi_state == ACPI_STATE_D3_COLD ? 0 :
                 (acpi_state == ACPI_STATE_D0 ? 1 : -1));
        return 0;
 }
@@ -108,7 +108,7 @@ fan_set_cur_state(struct thermal_cooling_device *cdev, unsigned long state)
                return -EINVAL;
 
        result = acpi_bus_set_power(device->handle,
-                               state ? ACPI_STATE_D0 : ACPI_STATE_D3);
+                               state ? ACPI_STATE_D0 : ACPI_STATE_D3_COLD);
 
        return result;
 }

diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index 5c28c894c0fc204925f489fdf988a01abb74bc88..4cdcc0cf0c561a4622798378b6ce2ca982d86228 100644 (file)
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -786,7 +786,7 @@ int acpi_power_get_inferred_state(struct acpi_device *device, int *state)
                }
        }
 
-       *state = ACPI_STATE_D3;
+       *state = ACPI_STATE_D3_COLD;
        return 0;
 }
 

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 8a46c924effd4e5bef09cb645429170e70ed380a..c30df3ad2d718dd12b5498482d5e3fd1bdea884b 100644 (file)
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1450,8 +1450,8 @@ static void acpi_bus_get_power_flags(struct acpi_device *device)
        /* Set defaults for D0 and D3 states (always valid) */
        device->power.states[ACPI_STATE_D0].flags.valid = 1;
        device->power.states[ACPI_STATE_D0].power = 100;
-       device->power.states[ACPI_STATE_D3].flags.valid = 1;
-       device->power.states[ACPI_STATE_D3].power = 0;
+       device->power.states[ACPI_STATE_D3_COLD].flags.valid = 1;
+       device->power.states[ACPI_STATE_D3_COLD].power = 0;
 
        /* Set D3cold's explicit_set flag if _PS3 exists. */
        if (device->power.states[ACPI_STATE_D3_HOT].flags.explicit_set)

diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
index cf4e7020adacde5e69881a21adb0c578d31d7a3e..da8170dfc90f142d8924de9c10be76444acbb250 100644 (file)
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
@@ -947,11 +947,11 @@ static void pata_acpi_set_state(struct ata_port *ap, pm_message_t state)
                        continue;
 
                acpi_bus_set_power(dev_handle, state.event & PM_EVENT_RESUME ?
-                                               ACPI_STATE_D0 : ACPI_STATE_D3);
+                                       ACPI_STATE_D0 : ACPI_STATE_D3_COLD);
        }
 
        if (!(state.event & PM_EVENT_RESUME))
-               acpi_bus_set_power(port_handle, ACPI_STATE_D3);
+               acpi_bus_set_power(port_handle, ACPI_STATE_D3_COLD);
 }
 
 /**

diff --git a/drivers/ide/ide-acpi.c b/drivers/ide/ide-acpi.c
index f1a6796b165c154bffd18d9c6f99e407aac24d96..140c8ef505291129d6299d2b4d4931d3b728589e 100644 (file)
--- 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);
 }
 
 /**

diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
index 55cd459a39080d6d162074c74772e9850d88c8f1..34049b0b4c731e352ae48f62c7fd3edcfc71b517 100644 (file)
--- a/drivers/pnp/pnpacpi/core.c
+++ b/drivers/pnp/pnpacpi/core.c
@@ -131,7 +131,7 @@ static int pnpacpi_disable_resources(struct pnp_dev *dev)
        /* acpi_unregister_gsi(pnp_irq(dev, 0)); */
        ret = 0;
        if (acpi_bus_power_manageable(handle))
-               acpi_bus_set_power(handle, ACPI_STATE_D3);
+               acpi_bus_set_power(handle, ACPI_STATE_D3_COLD);
                /* continue even if acpi_bus_set_power() fails */
        if (ACPI_FAILURE(acpi_evaluate_object(handle, "_DIS", NULL, NULL)))
                ret = -ENODEV;
@@ -174,10 +174,10 @@ static int pnpacpi_suspend(struct pnp_dev *dev, pm_message_t state)
 
        if (acpi_bus_power_manageable(handle)) {
                int power_state = acpi_pm_device_sleep_state(&dev->dev, NULL,
-                                                            ACPI_STATE_D3);
+                                                       ACPI_STATE_D3_COLD);
                if (power_state < 0)
                        power_state = (state.event == PM_EVENT_ON) ?
-                                       ACPI_STATE_D0 : ACPI_STATE_D3;
+                                       ACPI_STATE_D0 : ACPI_STATE_D3_COLD;
 
                /*
                 * acpi_bus_set_power() often fails (keyboard port can't be

diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 56e6b68c8d2fcb36fae154ebe6bb687f9e74760d..916b18933879bc37fbd7ca6c743e0db3e0e259c4 100644 (file)
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -478,7 +478,8 @@ static inline int acpi_pm_device_sleep_state(struct device *d, int *p, int m)
        if (p)
                *p = ACPI_STATE_D0;
 
-       return (m >= ACPI_STATE_D0 && m <= ACPI_STATE_D3) ? m : ACPI_STATE_D0;
+       return (m >= ACPI_STATE_D0 && m <= ACPI_STATE_D3_COLD) ?
+               m : ACPI_STATE_D0;
 }
 static inline void acpi_dev_pm_add_dependent(acpi_handle handle,
                                             struct device *depdev) {}