Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / drivers / acpi / utils.c

diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index c08fb74..d0d84c4 100644 (file)
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -58,31 +58,29 @@ acpi_extract_package(union acpi_object *package,
        u8 *head = NULL;
        u8 *tail = NULL;
 
-       ACPI_FUNCTION_TRACE("acpi_extract_package");
 
        if (!package || (package->type != ACPI_TYPE_PACKAGE)
            || (package->package.count < 1)) {
-               ACPI_DEBUG_PRINT((ACPI_DB_WARN,
-                                 "Invalid 'package' argument\n"));
-               return_ACPI_STATUS(AE_BAD_PARAMETER);
+               printk(KERN_WARNING PREFIX "Invalid package argument\n");
+               return AE_BAD_PARAMETER;
        }
 
        if (!format || !format->pointer || (format->length < 1)) {
-               ACPI_DEBUG_PRINT((ACPI_DB_WARN, "Invalid 'format' argument\n"));
-               return_ACPI_STATUS(AE_BAD_PARAMETER);
+               printk(KERN_WARNING PREFIX "Invalid format argument\n");
+               return AE_BAD_PARAMETER;
        }
 
        if (!buffer) {
-               ACPI_DEBUG_PRINT((ACPI_DB_WARN, "Invalid 'buffer' argument\n"));
-               return_ACPI_STATUS(AE_BAD_PARAMETER);
+               printk(KERN_WARNING PREFIX "Invalid buffer argument\n");
+               return 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));
-               return_ACPI_STATUS(AE_BAD_DATA);
+               printk(KERN_WARNING PREFIX "Format specifies more objects [%d]"
+                             " than exist in package [%d].\n",
+                             format_count, package->package.count);
+               return AE_BAD_DATA;
        }
 
        format_string = (char *)format->pointer;
@@ -95,7 +93,7 @@ acpi_extract_package(union acpi_object *package,
                union acpi_object *element = &(package->package.elements[i]);
 
                if (!element) {
-                       return_ACPI_STATUS(AE_BAD_DATA);
+                       return AE_BAD_DATA;
                }
 
                switch (element->type) {
@@ -113,10 +111,11 @@ 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]));
-                               return_ACPI_STATUS(AE_BAD_DATA);
+                               printk(KERN_WARNING PREFIX "Invalid package element"
+                                             " [%d]: got number, expecing"
+                                             " [%c]\n",
+                                             i, format_string[i]);
+                               return AE_BAD_DATA;
                                break;
                        }
                        break;
@@ -138,10 +137,11 @@ 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]));
-                               return_ACPI_STATUS(AE_BAD_DATA);
+                               printk(KERN_WARNING PREFIX "Invalid package element"
+                                             " [%d] got string/buffer,"
+                                             " expecing [%c]\n",
+                                             i, format_string[i]);
+                               return AE_BAD_DATA;
                                break;
                        }
                        break;
@@ -152,7 +152,7 @@ acpi_extract_package(union acpi_object *package,
                                          "Found unsupported element at index=%d\n",
                                          i));
                        /* TBD: handle nested packages... */
-                       return_ACPI_STATUS(AE_SUPPORT);
+                       return AE_SUPPORT;
                        break;
                }
        }
@@ -162,9 +162,9 @@ acpi_extract_package(union acpi_object *package,
         */
        if (buffer->length < size_required) {
                buffer->length = size_required;
-               return_ACPI_STATUS(AE_BUFFER_OVERFLOW);
+               return AE_BUFFER_OVERFLOW;
        } else if (buffer->length != size_required || !buffer->pointer) {
-               return_ACPI_STATUS(AE_BAD_PARAMETER);
+               return AE_BAD_PARAMETER;
        }
 
        head = buffer->pointer;
@@ -179,7 +179,7 @@ acpi_extract_package(union acpi_object *package,
                union acpi_object *element = &(package->package.elements[i]);
 
                if (!element) {
-                       return_ACPI_STATUS(AE_BAD_DATA);
+                       return AE_BAD_DATA;
                }
 
                switch (element->type) {
@@ -244,12 +244,11 @@ acpi_extract_package(union acpi_object *package,
                }
        }
 
-       return_ACPI_STATUS(AE_OK);
+       return AE_OK;
 }
 
 EXPORT_SYMBOL(acpi_extract_package);
 
-extern int acpi_in_resume;
 acpi_status
 acpi_evaluate_integer(acpi_handle handle,
                      acpi_string pathname,
@@ -259,17 +258,13 @@ acpi_evaluate_integer(acpi_handle handle,
        union acpi_object *element;
        struct acpi_buffer buffer = { 0, NULL };
 
-       ACPI_FUNCTION_TRACE("acpi_evaluate_integer");
 
        if (!data)
-               return_ACPI_STATUS(AE_BAD_PARAMETER);
+               return AE_BAD_PARAMETER;
 
-       if (acpi_in_resume)
-               element = kmalloc(sizeof(union acpi_object), GFP_ATOMIC);
-       else
-               element = kmalloc(sizeof(union acpi_object), GFP_KERNEL);
+       element = kmalloc(sizeof(union acpi_object), irqs_disabled() ? GFP_ATOMIC: GFP_KERNEL);
        if (!element)
-               return_ACPI_STATUS(AE_NO_MEMORY);
+               return AE_NO_MEMORY;
 
        memset(element, 0, sizeof(union acpi_object));
        buffer.length = sizeof(union acpi_object);
@@ -277,12 +272,14 @@ 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);
-               return_ACPI_STATUS(status);
+               kfree(element);
+               return status;
        }
 
        if (element->type != ACPI_TYPE_INTEGER) {
                acpi_util_eval_error(handle, pathname, AE_BAD_DATA);
-               return_ACPI_STATUS(AE_BAD_DATA);
+               kfree(element);
+               return AE_BAD_DATA;
        }
 
        *data = element->integer.value;
@@ -290,7 +287,7 @@ acpi_evaluate_integer(acpi_handle handle,
 
        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Return value [%lu]\n", *data));
 
-       return_ACPI_STATUS(AE_OK);
+       return AE_OK;
 }
 
 EXPORT_SYMBOL(acpi_evaluate_integer);
@@ -305,15 +302,14 @@ acpi_evaluate_string(acpi_handle handle,
        acpi_object *element = NULL;
        acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
 
-       ACPI_FUNCTION_TRACE("acpi_evaluate_string");
 
        if (!data)
-               return_ACPI_STATUS(AE_BAD_PARAMETER);
+               return AE_BAD_PARAMETER;
 
        status = acpi_evaluate_object(handle, pathname, arguments, &buffer);
        if (ACPI_FAILURE(status)) {
                acpi_util_eval_error(handle, pathname, status);
-               return_ACPI_STATUS(status);
+               return status;
        }
 
        element = (acpi_object *) buffer.pointer;
@@ -322,13 +318,13 @@ acpi_evaluate_string(acpi_handle handle,
            || (element->type != ACPI_TYPE_BUFFER)
            || !element->string.length) {
                acpi_util_eval_error(handle, pathname, AE_BAD_DATA);
-               return_ACPI_STATUS(AE_BAD_DATA);
+               return AE_BAD_DATA;
        }
 
        *data = kmalloc(element->string.length + 1, GFP_KERNEL);
        if (!data) {
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Memory allocation error\n"));
-               return_VALUE(-ENOMEM);
+               printk(KERN_ERR PREFIX "Memory allocation\n");
+               return -ENOMEM;
        }
        memset(*data, 0, element->string.length + 1);
 
@@ -336,9 +332,9 @@ acpi_evaluate_string(acpi_handle handle,
 
        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Return value [%s]\n", *data));
 
-       acpi_os_free(buffer.pointer);
+       kfree(buffer.pointer);
 
-       return_ACPI_STATUS(AE_OK);
+       return AE_OK;
 }
 #endif
 
@@ -354,10 +350,9 @@ acpi_evaluate_reference(acpi_handle handle,
        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
        u32 i = 0;
 
-       ACPI_FUNCTION_TRACE("acpi_evaluate_reference");
 
        if (!list) {
-               return_ACPI_STATUS(AE_BAD_PARAMETER);
+               return AE_BAD_PARAMETER;
        }
 
        /* Evaluate object. */
@@ -369,32 +364,29 @@ 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;
        }
 
        if (package->package.count > ACPI_MAX_HANDLES) {
-               return_ACPI_STATUS(AE_NO_MEMORY);
+               return AE_NO_MEMORY;
        }
        list->count = package->package.count;
 
@@ -406,9 +398,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;
                }
@@ -426,9 +418,9 @@ acpi_evaluate_reference(acpi_handle handle,
                //kfree(list->handles);
        }
 
-       acpi_os_free(buffer.pointer);
+       kfree(buffer.pointer);
 
-       return_ACPI_STATUS(status);
+       return status;
 }
 
 EXPORT_SYMBOL(acpi_evaluate_reference);