ACPI: un-export ACPI_ERROR() -- use printk(KERN_ERR...)

[pandora-kernel.git] / drivers / acpi / utils.c

diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index 6458c47..a5da4ef 100644 (file)
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -62,26 +62,25 @@ acpi_extract_package(union acpi_object *package,
 
        if (!package || (package->type != ACPI_TYPE_PACKAGE)
            || (package->package.count < 1)) {
-               ACPI_DEBUG_PRINT((ACPI_DB_WARN,
-                                 "Invalid 'package' argument\n"));
+               printk(KERN_WARNING PREFIX "Invalid package argument\n");
                return_ACPI_STATUS(AE_BAD_PARAMETER);
        }
 
        if (!format || !format->pointer || (format->length < 1)) {
-               ACPI_DEBUG_PRINT((ACPI_DB_WARN, "Invalid 'format' argument\n"));
+               printk(KERN_WARNING PREFIX "Invalid format argument\n");
                return_ACPI_STATUS(AE_BAD_PARAMETER);
        }
 
        if (!buffer) {
-               ACPI_DEBUG_PRINT((ACPI_DB_WARN, "Invalid 'buffer' argument\n"));
+               printk(KERN_WARNING PREFIX "Invalid buffer argument\n");
                return_ACPI_STATUS(AE_BAD_PARAMETER);
        }
 
        format_count = (format->length / sizeof(char)) - 1;
        if (format_count > package->package.count) {
-               ACPI_DEBUG_PRINT((ACPI_DB_WARN,
-                                 "Format specifies more objects [%d] than exist in package [%d].",
-                                 format_count, package->package.count));
+               printk(KERN_WARNING PREFIX "Format specifies more objects [%d]"
+                             " than exist in package [%d].\n",
+                             format_count, package->package.count);
                return_ACPI_STATUS(AE_BAD_DATA);
        }
 
@@ -113,9 +112,10 @@ acpi_extract_package(union acpi_object *package,
                                tail_offset += sizeof(char *);
                                break;
                        default:
-                               ACPI_DEBUG_PRINT((ACPI_DB_WARN,
-                                                 "Invalid package element [%d]: got number, expecing [%c].\n",
-                                                 i, format_string[i]));
+                               printk(KERN_WARNING PREFIX "Invalid package element"
+                                             " [%d]: got number, expecing"
+                                             " [%c]\n",
+                                             i, format_string[i]);
                                return_ACPI_STATUS(AE_BAD_DATA);
                                break;
                        }
@@ -138,9 +138,10 @@ acpi_extract_package(union acpi_object *package,
                                tail_offset += sizeof(u8 *);
                                break;
                        default:
-                               ACPI_DEBUG_PRINT((ACPI_DB_WARN,
-                                                 "Invalid package element [%d] got string/buffer, expecing [%c].\n",
-                                                 i, format_string[i]));
+                               printk(KERN_WARNING PREFIX "Invalid package element"
+                                             " [%d] got string/buffer,"
+                                             " expecing [%c]\n",
+                                             i, format_string[i]);
                                return_ACPI_STATUS(AE_BAD_DATA);
                                break;
                        }
@@ -273,11 +274,13 @@ acpi_evaluate_integer(acpi_handle handle,
        status = acpi_evaluate_object(handle, pathname, arguments, &buffer);
        if (ACPI_FAILURE(status)) {
                acpi_util_eval_error(handle, pathname, status);
+               kfree(element);
                return_ACPI_STATUS(status);
        }
 
        if (element->type != ACPI_TYPE_INTEGER) {
                acpi_util_eval_error(handle, pathname, AE_BAD_DATA);
+               kfree(element);
                return_ACPI_STATUS(AE_BAD_DATA);
        }
 
@@ -323,7 +326,7 @@ acpi_evaluate_string(acpi_handle handle,
 
        *data = kmalloc(element->string.length + 1, GFP_KERNEL);
        if (!data) {
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Memory allocation error\n"));
+               printk(KERN_ERR PREFIX "Memory allocation\n");
                return_VALUE(-ENOMEM);
        }
        memset(*data, 0, element->string.length + 1);
@@ -365,25 +368,22 @@ acpi_evaluate_reference(acpi_handle handle,
        package = (union acpi_object *)buffer.pointer;
 
        if ((buffer.length == 0) || !package) {
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                 "No return object (len %X ptr %p)\n",
-                                 (unsigned)buffer.length, package));
+               printk(KERN_ERR PREFIX "No return object (len %X ptr %p)\n",
+                           (unsigned)buffer.length, package);
                status = AE_BAD_DATA;
                acpi_util_eval_error(handle, pathname, status);
                goto end;
        }
        if (package->type != ACPI_TYPE_PACKAGE) {
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                 "Expecting a [Package], found type %X\n",
-                                 package->type));
+               printk(KERN_ERR PREFIX "Expecting a [Package], found type %X\n",
+                           package->type);
                status = AE_BAD_DATA;
                acpi_util_eval_error(handle, pathname, status);
                goto end;
        }
        if (!package->package.count) {
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                 "[Package] has zero elements (%p)\n",
-                                 package));
+               printk(KERN_ERR PREFIX "[Package] has zero elements (%p)\n",
+                           package);
                status = AE_BAD_DATA;
                acpi_util_eval_error(handle, pathname, status);
                goto end;
@@ -402,9 +402,9 @@ acpi_evaluate_reference(acpi_handle handle,
 
                if (element->type != ACPI_TYPE_ANY) {
                        status = AE_BAD_DATA;
-                       ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                         "Expecting a [Reference] package element, found type %X\n",
-                                         element->type));
+                       printk(KERN_ERR PREFIX
+                                   "Expecting a [Reference] package element, found type %X\n",
+                                   element->type);
                        acpi_util_eval_error(handle, pathname, status);
                        break;
                }