8 files changed, 29 insertions, 33 deletions

diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
index 4ab807dc8518..59d3202f6b36 100644
--- a/drivers/acpi/device_pm.c
+++ b/drivers/acpi/device_pm.c
@@ -159,26 +159,29 @@ int acpi_device_set_power(struct acpi_device *device, int state)
         int result = 0;
         bool cut_power = false;
 
-        if (!device || (state < ACPI_STATE_D0) || (state > ACPI_STATE_D3_COLD))
+        if (!device || !device->flags.power_manageable
+            || (state < ACPI_STATE_D0) || (state > ACPI_STATE_D3_COLD))
                 return -EINVAL;
 
         /* Make sure this is a valid target state */
 
         if (state == device->power.state) {
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device is already at %s\n",
+                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device [%s] already in %s\n",
+                                  device->pnp.bus_id,
                                   acpi_power_state_string(state)));
                 return 0;
         }
 
         if (!device->power.states[state].flags.valid) {
-                printk(KERN_WARNING PREFIX "Device does not support %s\n",
-                       acpi_power_state_string(state));
+                dev_warn(&device->dev, "Power state %s not supported\n",
+                         acpi_power_state_string(state));
                 return -ENODEV;
         }
         if (device->parent && (state < device->parent->power.state)) {
-                printk(KERN_WARNING PREFIX
-                              "Cannot set device to a higher-powered"
-                              " state than parent\n");
+                dev_warn(&device->dev,
+                         "Cannot transition to power state %s for parent in %s\n",
+                         acpi_power_state_string(state),
+                         acpi_power_state_string(device->parent->power.state));
                 return -ENODEV;
         }
 
@@ -191,8 +194,8 @@ int acpi_device_set_power(struct acpi_device *device, int state)
 
         if (state < device->power.state && state != ACPI_STATE_D0
             && device->power.state >= ACPI_STATE_D3_HOT) {
-                printk(KERN_WARNING PREFIX
-                        "Cannot transition to non-D0 state from D3\n");
+                dev_warn(&device->dev,
+                         "Cannot transition to non-D0 state from D3\n");
                 return -ENODEV;
         }
 
@@ -219,10 +222,8 @@ int acpi_device_set_power(struct acpi_device *device, int state)
 
  end:
         if (result) {
-                printk(KERN_WARNING PREFIX
-                              "Device [%s] failed to transition to %s\n",
-                              device->pnp.bus_id,
-                              acpi_power_state_string(state));
+                dev_warn(&device->dev, "Failed to change power state to %s\n",
+                         acpi_power_state_string(state));
         } else {
                 device->power.state = state;
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
@@ -244,13 +245,6 @@ int acpi_bus_set_power(acpi_handle handle, int state)
         if (result)
                 return result;
 
-        if (!device->flags.power_manageable) {
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                "Device [%s] is not power manageable\n",
-                                dev_name(&device->dev)));
-                return -ENODEV;
-        }
-
         return acpi_device_set_power(device, state);
 }
 EXPORT_SYMBOL(acpi_bus_set_power);
diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index 5b02a0aa540c..41ade6570bc0 100644
--- 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 1460c88a7c0e..0dbe5cdf3396 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -784,7 +784,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 d5993e339a26..a8a55d4143f2 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1409,8 +1409,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 cf4e7020adac..da8170dfc90f 100644
--- 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 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);
 }
 
 /**
diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
index 55cd459a3908..34049b0b4c73 100644
--- 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 904379b5f2fb..5852c20760a3 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -486,7 +486,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) {}