diff options
author | Len Brown <len.brown@intel.com> | 2006-07-25 13:30:57 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2006-07-25 13:30:57 -0400 |
commit | 9805cb76f7bcd3108e012270d9ef2fd8ea3bea55 (patch) | |
tree | e046dff9f431183f86ed43b83776cdef2750d649 /drivers/acpi | |
parent | 9b6d97b64eff08b368375efcf9c1d01eba582ea2 (diff) |
ACPI: restore some dmesg to DEBUG-only, ala 2.6.17
The ACPI_EXCEPTION() patch enabled a bunch of messages to print
even in the non-DEBUG kernel. Need to change a couple back,
and note that ACPI_EXCEPTION takes no \n, but ACPI_DEBUG_PRINT does.
No context for object [%p]\n
Device `[%s]' is not power manageable\n
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/bus.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 7b77ee146a80..279c4bac92e5 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c | |||
@@ -69,7 +69,8 @@ int acpi_bus_get_device(acpi_handle handle, struct acpi_device **device) | |||
69 | 69 | ||
70 | status = acpi_get_data(handle, acpi_bus_data_handler, (void **)device); | 70 | status = acpi_get_data(handle, acpi_bus_data_handler, (void **)device); |
71 | if (ACPI_FAILURE(status) || !*device) { | 71 | if (ACPI_FAILURE(status) || !*device) { |
72 | ACPI_EXCEPTION((AE_INFO, status, "No context for object [%p]", handle)); | 72 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No context for object [%p]\n", |
73 | handle)); | ||
73 | return -ENODEV; | 74 | return -ENODEV; |
74 | } | 75 | } |
75 | 76 | ||
@@ -193,7 +194,7 @@ int acpi_bus_set_power(acpi_handle handle, int state) | |||
193 | /* Make sure this is a valid target state */ | 194 | /* Make sure this is a valid target state */ |
194 | 195 | ||
195 | if (!device->flags.power_manageable) { | 196 | if (!device->flags.power_manageable) { |
196 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device `[%s]' is not power manageable", | 197 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device `[%s]' is not power manageable\n", |
197 | device->kobj.name)); | 198 | device->kobj.name)); |
198 | return -ENODEV; | 199 | return -ENODEV; |
199 | } | 200 | } |