summaryrefslogtreecommitdiff
path: root/drivers/acpi/power.c
diff options
context:
space:
mode:
authorMiguel Botón <mboton@gmail.com>2008-02-05 10:31:19 +0300
committerLen Brown <len.brown@intel.com>2008-02-07 08:49:28 +0300
commite76d5f7e831a3f33dd6fa8eb94533b0b4cb22b6f (patch)
tree9a5d98ae2d6a66c96d5b754d8c36ba3f6547699d /drivers/acpi/power.c
parent488b5ec871191359b9b79262a3d48456dae7ea5f (diff)
downloadlinux-e76d5f7e831a3f33dd6fa8eb94533b0b4cb22b6f.tar.xz
ACPI: remove duplicated warning message
Remove duplicated warning message in acpi_power_transition() ACPI: Transitioning device [%s] to D%d\n This warning message is printed by acpi_bus_set_power() so we don't need to print it again. Signed-off-by: Miguel Botón <mboton@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/power.c')
-rw-r--r--drivers/acpi/power.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index af1769a20c7a..76bf6d90c700 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -458,11 +458,9 @@ int acpi_power_transition(struct acpi_device *device, int state)
}
end:
- if (result) {
+ if (result)
device->power.state = ACPI_STATE_UNKNOWN;
- printk(KERN_WARNING PREFIX "Transitioning device [%s] to D%d\n",
- device->pnp.bus_id, state);
- } else {
+ else {
/* We shouldn't change the state till all above operations succeed */
device->power.state = state;
}