linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/drivers/acpi/executer/exnames.c b/drivers/acpi/executer/exnames.c
index d3d7036..054fe5e 100644 (file)
--- a/drivers/acpi/executer/exnames.c
+++ b/drivers/acpi/executer/exnames.c
@@ -77,7 +77,7 @@ static char *acpi_ex_allocate_name_string(u32 prefix_count, u32 num_name_segs)
        char *name_string;
        u32 size_needed;
 
-       ACPI_FUNCTION_TRACE(ex_allocate_name_string);
+       ACPI_FUNCTION_TRACE("ex_allocate_name_string");
 
        /*
         * Allow room for all \ and ^ prefixes, all segments and a multi_name_prefix.
@@ -85,7 +85,6 @@ static char *acpi_ex_allocate_name_string(u32 prefix_count, u32 num_name_segs)
         * This may actually be somewhat longer than needed.
         */
        if (prefix_count == ACPI_UINT32_MAX) {
-
                /* Special case for root */
 
                size_needed = 1 + (ACPI_NAME_SIZE * num_name_segs) + 2 + 1;
@@ -98,7 +97,7 @@ static char *acpi_ex_allocate_name_string(u32 prefix_count, u32 num_name_segs)
         * Allocate a buffer for the name.
         * This buffer must be deleted by the caller!
         */
-       name_string = ACPI_ALLOCATE(size_needed);
+       name_string = ACPI_MEM_ALLOCATE(size_needed);
        if (!name_string) {
                ACPI_ERROR((AE_INFO,
                            "Could not allocate size %d", size_needed));
@@ -120,13 +119,11 @@ static char *acpi_ex_allocate_name_string(u32 prefix_count, u32 num_name_segs)
        /* Set up Dual or Multi prefixes if needed */
 
        if (num_name_segs > 2) {
-
                /* Set up multi prefixes   */
 
                *temp_ptr++ = AML_MULTI_NAME_PREFIX_OP;
                *temp_ptr++ = (char)num_name_segs;
        } else if (2 == num_name_segs) {
-
                /* Set up dual prefixes */
 
                *temp_ptr++ = AML_DUAL_NAME_PREFIX;
@@ -162,7 +159,7 @@ static acpi_status acpi_ex_name_segment(u8 ** in_aml_address, char *name_string)
        u32 index;
        char char_buf[5];
 
-       ACPI_FUNCTION_TRACE(ex_name_segment);
+       ACPI_FUNCTION_TRACE("ex_name_segment");
 
        /*
         * If first character is a digit, then we know that we aren't looking at a
@@ -179,7 +176,7 @@ static acpi_status acpi_ex_name_segment(u8 ** in_aml_address, char *name_string)
 
        for (index = 0;
             (index < ACPI_NAME_SIZE)
-            && (acpi_ut_valid_acpi_char(*aml_address, 0)); index++) {
+            && (acpi_ut_valid_acpi_character(*aml_address)); index++) {
                char_buf[index] = *aml_address++;
                ACPI_DEBUG_PRINT((ACPI_DB_LOAD, "%c\n", char_buf[index]));
        }
@@ -187,7 +184,6 @@ static acpi_status acpi_ex_name_segment(u8 ** in_aml_address, char *name_string)
        /* Valid name segment  */
 
        if (index == 4) {
-
                /* Found 4 valid characters */
 
                char_buf[4] = '\0';
@@ -253,12 +249,11 @@ acpi_ex_get_name_string(acpi_object_type data_type,
        u32 prefix_count = 0;
        u8 has_prefix = FALSE;
 
-       ACPI_FUNCTION_TRACE_PTR(ex_get_name_string, aml_address);
+       ACPI_FUNCTION_TRACE_PTR("ex_get_name_string", aml_address);
 
        if (ACPI_TYPE_LOCAL_REGION_FIELD == data_type ||
            ACPI_TYPE_LOCAL_BANK_FIELD == data_type ||
            ACPI_TYPE_LOCAL_INDEX_FIELD == data_type) {
-
                /* Disallow prefixes for types associated with field_unit names */
 
                name_string = acpi_ex_allocate_name_string(0, 1);
@@ -277,7 +272,7 @@ acpi_ex_get_name_string(acpi_object_type data_type,
                case AML_ROOT_PREFIX:
 
                        ACPI_DEBUG_PRINT((ACPI_DB_LOAD,
-                                         "RootPrefix(\\) at %p\n",
+                                         "root_prefix(\\) at %p\n",
                                          aml_address));
 
                        /*
@@ -295,7 +290,7 @@ acpi_ex_get_name_string(acpi_object_type data_type,
 
                        do {
                                ACPI_DEBUG_PRINT((ACPI_DB_LOAD,
-                                                 "ParentPrefix (^) at %p\n",
+                                                 "parent_prefix (^) at %p\n",
                                                  aml_address));
 
                                aml_address++;
@@ -319,7 +314,7 @@ acpi_ex_get_name_string(acpi_object_type data_type,
                case AML_DUAL_NAME_PREFIX:
 
                        ACPI_DEBUG_PRINT((ACPI_DB_LOAD,
-                                         "DualNamePrefix at %p\n",
+                                         "dual_name_prefix at %p\n",
                                          aml_address));
 
                        aml_address++;
@@ -346,7 +341,7 @@ acpi_ex_get_name_string(acpi_object_type data_type,
                case AML_MULTI_NAME_PREFIX_OP:
 
                        ACPI_DEBUG_PRINT((ACPI_DB_LOAD,
-                                         "MultiNamePrefix at %p\n",
+                                         "multi_name_prefix at %p\n",
                                          aml_address));
 
                        /* Fetch count of segments remaining in name path */
@@ -382,7 +377,7 @@ acpi_ex_get_name_string(acpi_object_type data_type,
 
                        if (prefix_count == ACPI_UINT32_MAX) {
                                ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
-                                                 "NameSeg is \"\\\" followed by NULL\n"));
+                                                 "name_seg is \"\\\" followed by NULL\n"));
                        }
 
                        /* Consume the NULL byte */
@@ -415,7 +410,6 @@ acpi_ex_get_name_string(acpi_object_type data_type,
        }
 
        if (AE_CTRL_PENDING == status && has_prefix) {
-
                /* Ran out of segments after processing a prefix */
 
                ACPI_ERROR((AE_INFO, "Malformed Name at %p", name_string));
@@ -424,7 +418,7 @@ acpi_ex_get_name_string(acpi_object_type data_type,
 
        if (ACPI_FAILURE(status)) {
                if (name_string) {
-                       ACPI_FREE(name_string);
+                       ACPI_MEM_FREE(name_string);
                }
                return_ACPI_STATUS(status);
        }