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/utils.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/utils.c')
-rw-r--r-- | drivers/acpi/utils.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c index 040ff473d1f2..a5da4efab063 100644 --- a/drivers/acpi/utils.c +++ b/drivers/acpi/utils.c | |||
@@ -326,7 +326,7 @@ acpi_evaluate_string(acpi_handle handle, | |||
326 | 326 | ||
327 | *data = kmalloc(element->string.length + 1, GFP_KERNEL); | 327 | *data = kmalloc(element->string.length + 1, GFP_KERNEL); |
328 | if (!data) { | 328 | if (!data) { |
329 | ACPI_ERROR((AE_INFO, "Memory allocation")); | 329 | printk(KERN_ERR PREFIX "Memory allocation\n"); |
330 | return_VALUE(-ENOMEM); | 330 | return_VALUE(-ENOMEM); |
331 | } | 331 | } |
332 | memset(*data, 0, element->string.length + 1); | 332 | memset(*data, 0, element->string.length + 1); |
@@ -368,22 +368,22 @@ acpi_evaluate_reference(acpi_handle handle, | |||
368 | package = (union acpi_object *)buffer.pointer; | 368 | package = (union acpi_object *)buffer.pointer; |
369 | 369 | ||
370 | if ((buffer.length == 0) || !package) { | 370 | if ((buffer.length == 0) || !package) { |
371 | ACPI_ERROR((AE_INFO, "No return object (len %X ptr %p)", | 371 | printk(KERN_ERR PREFIX "No return object (len %X ptr %p)\n", |
372 | (unsigned)buffer.length, package)); | 372 | (unsigned)buffer.length, package); |
373 | status = AE_BAD_DATA; | 373 | status = AE_BAD_DATA; |
374 | acpi_util_eval_error(handle, pathname, status); | 374 | acpi_util_eval_error(handle, pathname, status); |
375 | goto end; | 375 | goto end; |
376 | } | 376 | } |
377 | if (package->type != ACPI_TYPE_PACKAGE) { | 377 | if (package->type != ACPI_TYPE_PACKAGE) { |
378 | ACPI_ERROR((AE_INFO, "Expecting a [Package], found type %X", | 378 | printk(KERN_ERR PREFIX "Expecting a [Package], found type %X\n", |
379 | package->type)); | 379 | package->type); |
380 | status = AE_BAD_DATA; | 380 | status = AE_BAD_DATA; |
381 | acpi_util_eval_error(handle, pathname, status); | 381 | acpi_util_eval_error(handle, pathname, status); |
382 | goto end; | 382 | goto end; |
383 | } | 383 | } |
384 | if (!package->package.count) { | 384 | if (!package->package.count) { |
385 | ACPI_ERROR((AE_INFO, "[Package] has zero elements (%p)", | 385 | printk(KERN_ERR PREFIX "[Package] has zero elements (%p)\n", |
386 | package)); | 386 | package); |
387 | status = AE_BAD_DATA; | 387 | status = AE_BAD_DATA; |
388 | acpi_util_eval_error(handle, pathname, status); | 388 | acpi_util_eval_error(handle, pathname, status); |
389 | goto end; | 389 | goto end; |
@@ -402,9 +402,9 @@ acpi_evaluate_reference(acpi_handle handle, | |||
402 | 402 | ||
403 | if (element->type != ACPI_TYPE_ANY) { | 403 | if (element->type != ACPI_TYPE_ANY) { |
404 | status = AE_BAD_DATA; | 404 | status = AE_BAD_DATA; |
405 | ACPI_ERROR((AE_INFO, | 405 | printk(KERN_ERR PREFIX |
406 | "Expecting a [Reference] package element, found type %X", | 406 | "Expecting a [Reference] package element, found type %X\n", |
407 | element->type)); | 407 | element->type); |
408 | acpi_util_eval_error(handle, pathname, status); | 408 | acpi_util_eval_error(handle, pathname, status); |
409 | break; | 409 | break; |
410 | } | 410 | } |