diff options
author | Len Brown <len.brown@intel.com> | 2006-06-26 23:41:38 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2006-06-27 00:01:06 -0400 |
commit | 6468463abd7051fcc29f3ee7c931f9bbbb26f5a4 (patch) | |
tree | d18eae04fe6c8f7d257077cc6056cd9c6f424e0d /drivers/acpi/power.c | |
parent | cece92969762b8ed7930d4e23008b76b06411dee (diff) |
ACPI: un-export ACPI_ERROR() -- use printk(KERN_ERR...)
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/power.c')
-rw-r--r-- | drivers/acpi/power.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c index 43688c8280e5..efc4bb751286 100644 --- a/drivers/acpi/power.c +++ b/drivers/acpi/power.c | |||
@@ -291,7 +291,7 @@ int acpi_enable_wakeup_device_power(struct acpi_device *dev) | |||
291 | for (i = 0; i < dev->wakeup.resources.count; i++) { | 291 | for (i = 0; i < dev->wakeup.resources.count; i++) { |
292 | ret = acpi_power_on(dev->wakeup.resources.handles[i]); | 292 | ret = acpi_power_on(dev->wakeup.resources.handles[i]); |
293 | if (ret) { | 293 | if (ret) { |
294 | ACPI_ERROR((AE_INFO, "Transition power state")); | 294 | printk(KERN_ERR PREFIX "Transition power state\n"); |
295 | dev->wakeup.flags.valid = 0; | 295 | dev->wakeup.flags.valid = 0; |
296 | return_VALUE(-1); | 296 | return_VALUE(-1); |
297 | } | 297 | } |
@@ -300,7 +300,7 @@ int acpi_enable_wakeup_device_power(struct acpi_device *dev) | |||
300 | /* Execute PSW */ | 300 | /* Execute PSW */ |
301 | status = acpi_evaluate_object(dev->handle, "_PSW", &arg_list, NULL); | 301 | status = acpi_evaluate_object(dev->handle, "_PSW", &arg_list, NULL); |
302 | if (ACPI_FAILURE(status) && (status != AE_NOT_FOUND)) { | 302 | if (ACPI_FAILURE(status) && (status != AE_NOT_FOUND)) { |
303 | ACPI_ERROR((AE_INFO, "Evaluate _PSW")); | 303 | printk(KERN_ERR PREFIX "Evaluate _PSW\n"); |
304 | dev->wakeup.flags.valid = 0; | 304 | dev->wakeup.flags.valid = 0; |
305 | ret = -1; | 305 | ret = -1; |
306 | } | 306 | } |
@@ -330,7 +330,7 @@ int acpi_disable_wakeup_device_power(struct acpi_device *dev) | |||
330 | /* Execute PSW */ | 330 | /* Execute PSW */ |
331 | status = acpi_evaluate_object(dev->handle, "_PSW", &arg_list, NULL); | 331 | status = acpi_evaluate_object(dev->handle, "_PSW", &arg_list, NULL); |
332 | if (ACPI_FAILURE(status) && (status != AE_NOT_FOUND)) { | 332 | if (ACPI_FAILURE(status) && (status != AE_NOT_FOUND)) { |
333 | ACPI_ERROR((AE_INFO, "Evaluate _PSW")); | 333 | printk(KERN_ERR PREFIX "Evaluate _PSW\n"); |
334 | dev->wakeup.flags.valid = 0; | 334 | dev->wakeup.flags.valid = 0; |
335 | return_VALUE(-1); | 335 | return_VALUE(-1); |
336 | } | 336 | } |
@@ -339,7 +339,7 @@ int acpi_disable_wakeup_device_power(struct acpi_device *dev) | |||
339 | for (i = 0; i < dev->wakeup.resources.count; i++) { | 339 | for (i = 0; i < dev->wakeup.resources.count; i++) { |
340 | ret = acpi_power_off_device(dev->wakeup.resources.handles[i]); | 340 | ret = acpi_power_off_device(dev->wakeup.resources.handles[i]); |
341 | if (ret) { | 341 | if (ret) { |
342 | ACPI_ERROR((AE_INFO, "Transition power state")); | 342 | printk(KERN_ERR PREFIX "Transition power state\n"); |
343 | dev->wakeup.flags.valid = 0; | 343 | dev->wakeup.flags.valid = 0; |
344 | return_VALUE(-1); | 344 | return_VALUE(-1); |
345 | } | 345 | } |