linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / acpi / executer / exstoren.c

diff --git a/drivers/acpi/executer/exstoren.c b/drivers/acpi/executer/exstoren.c
index 591aaf0..42967ba 100644 (file)
--- a/drivers/acpi/executer/exstoren.c
+++ b/drivers/acpi/executer/exstoren.c
@@ -72,7 +72,7 @@ acpi_ex_resolve_object(union acpi_operand_object **source_desc_ptr,
        union acpi_operand_object *source_desc = *source_desc_ptr;
        acpi_status status = AE_OK;
 
-       ACPI_FUNCTION_TRACE(ex_resolve_object);
+       ACPI_FUNCTION_TRACE("ex_resolve_object");
 
        /* Ensure we have a Target that can be stored to */
 
@@ -97,7 +97,6 @@ acpi_ex_resolve_object(union acpi_operand_object **source_desc_ptr,
                 */
                if (ACPI_GET_OBJECT_TYPE(source_desc) ==
                    ACPI_TYPE_LOCAL_REFERENCE) {
-
                        /* Resolve a reference object first */
 
                        status =
@@ -122,7 +121,6 @@ acpi_ex_resolve_object(union acpi_operand_object **source_desc_ptr,
                    !((ACPI_GET_OBJECT_TYPE(source_desc) ==
                       ACPI_TYPE_LOCAL_REFERENCE)
                      && (source_desc->reference.opcode == AML_LOAD_OP))) {
-
                        /* Conversion successful but still not a valid type */
 
                        ACPI_ERROR((AE_INFO,
@@ -201,7 +199,7 @@ acpi_ex_store_object_to_object(union acpi_operand_object *source_desc,
        union acpi_operand_object *actual_src_desc;
        acpi_status status = AE_OK;
 
-       ACPI_FUNCTION_TRACE_PTR(ex_store_object_to_object, source_desc);
+       ACPI_FUNCTION_TRACE_PTR("ex_store_object_to_object", source_desc);
 
        actual_src_desc = source_desc;
        if (!dest_desc) {
@@ -291,7 +289,6 @@ acpi_ex_store_object_to_object(union acpi_operand_object *source_desc,
        }
 
        if (actual_src_desc != source_desc) {
-
                /* Delete the intermediate (temporary) source object */
 
                acpi_ut_remove_reference(actual_src_desc);