ACPI: ACPICA 20060421

Removed a device initialization optimization introduced in
20051216 where the _STA method was not run unless an _INI
was also present for the same device. This optimization
could cause problems because it could allow _INI methods
to be run within a not-present device subtree (If a
not-present device had no _INI, _STA would not be run,
the not-present status would not be discovered, and the
children of the device would be incorrectly traversed.)

Implemented a new _STA optimization where namespace
subtrees that do not contain _INI are identified and
ignored during device initialization. Selectively running
_STA can significantly improve boot time on large machines
(with assistance from Len Brown.)

Implemented support for the device initialization case
where the returned _STA flags indicate a device not-present
but functioning. In this case, _INI is not run, but the
device children are examined for presence, as per the
ACPI specification.

Implemented an additional change to the IndexField support
in order to conform to MS behavior. The value written to
the Index Register is not simply a byte offset, it is a
byte offset in units of the access width of the parent
Index Field. (Fiodor Suietov)

Defined and deployed a new OSL interface,
acpi_os_validate_address().  This interface is called during
the creation of all AML operation regions, and allows
the host OS to exert control over what addresses it will
allow the AML code to access. Operation Regions whose
addresses are disallowed will cause a runtime exception
when they are actually accessed (will not affect or abort
table loading.)

Defined and deployed a new OSL interface,
acpi_os_validate_interface().  This interface allows the host OS
to match the various "optional" interface/behavior strings
for the _OSI predefined control method as appropriate
(with assistance from Bjorn Helgaas.)

Restructured and corrected various problems in the
exception handling code paths within DsCallControlMethod
and DsTerminateControlMethod in dsmethod (with assistance
from Takayoshi Kochi.)

Modified the Linux source converter to ignore quoted string
literals while converting identifiers from mixed to lower
case. This will correct problems with the disassembler
and other areas where such strings must not be modified.

The ACPI_FUNCTION_* macros no longer require quotes around
the function name. This allows the Linux source converter
to convert the names, now that the converter ignores
quoted strings.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

7 files changed, 54 insertions, 54 deletions

diff --git a/drivers/acpi/resources/rscalc.c b/drivers/acpi/resources/rscalc.c
index dd5caa2c8fdd..a573ad5d41db 100644
--- a/drivers/acpi/resources/rscalc.c
+++ b/drivers/acpi/resources/rscalc.c
@@ -190,7 +190,7 @@ acpi_rs_get_aml_length(struct acpi_resource * resource, acpi_size * size_needed)
         acpi_size aml_size_needed = 0;
         acpi_rs_length total_size;
 
-        ACPI_FUNCTION_TRACE("rs_get_aml_length");
+        ACPI_FUNCTION_TRACE(rs_get_aml_length);
 
         /* Traverse entire list of internal resource descriptors */
 
@@ -345,7 +345,7 @@ acpi_rs_get_list_length(u8 * aml_buffer,
         u8 resource_index;
         u8 minimum_aml_resource_length;
 
-        ACPI_FUNCTION_TRACE("rs_get_list_length");
+        ACPI_FUNCTION_TRACE(rs_get_list_length);
 
         *size_needed = 0;
         end_aml = aml_buffer + aml_buffer_length;
@@ -456,7 +456,7 @@ acpi_rs_get_list_length(u8 * aml_buffer,
                 *size_needed += buffer_size;
 
                 ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES,
-                                  "Type %.2X, aml_length %.2X internal_length %.2X\n",
+                                  "Type %.2X, AmlLength %.2X InternalLength %.2X\n",
                                   acpi_ut_get_resource_type(aml_buffer),
                                   acpi_ut_get_descriptor_length(aml_buffer),
                                   buffer_size));
@@ -503,7 +503,7 @@ acpi_rs_get_pci_routing_table_length(union acpi_operand_object *package_object,
         u8 name_found;
         u32 table_index;
 
-        ACPI_FUNCTION_TRACE("rs_get_pci_routing_table_length");
+        ACPI_FUNCTION_TRACE(rs_get_pci_routing_table_length);
 
         number_of_elements = package_object->package.count;
 
diff --git a/drivers/acpi/resources/rscreate.c b/drivers/acpi/resources/rscreate.c
index 01488cfc9bae..4c322daaf885 100644
--- a/drivers/acpi/resources/rscreate.c
+++ b/drivers/acpi/resources/rscreate.c
@@ -77,9 +77,9 @@ acpi_rs_create_resource_list(union acpi_operand_object *aml_buffer,
         u32 aml_buffer_length;
         void *resource;
 
-        ACPI_FUNCTION_TRACE("rs_create_resource_list");
+        ACPI_FUNCTION_TRACE(rs_create_resource_list);
 
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "aml_buffer = %p\n", aml_buffer));
+        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "AmlBuffer = %p\n", aml_buffer));
 
         /* Params already validated, so we don't re-validate here */
 
@@ -93,7 +93,7 @@ acpi_rs_create_resource_list(union acpi_operand_object *aml_buffer,
         status = acpi_rs_get_list_length(aml_start, aml_buffer_length,
                                          &list_size_needed);
 
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Status=%X list_size_needed=%X\n",
+        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Status=%X ListSizeNeeded=%X\n",
                           status, (u32) list_size_needed));
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
@@ -116,7 +116,7 @@ acpi_rs_create_resource_list(union acpi_operand_object *aml_buffer,
                 return_ACPI_STATUS(status);
         }
 
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "output_buffer %p Length %X\n",
+        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "OutputBuffer %p Length %X\n",
                           output_buffer->pointer, (u32) output_buffer->length));
         return_ACPI_STATUS(AE_OK);
 }
@@ -158,7 +158,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
         acpi_status status;
         struct acpi_buffer path_buffer;
 
-        ACPI_FUNCTION_TRACE("rs_create_pci_routing_table");
+        ACPI_FUNCTION_TRACE(rs_create_pci_routing_table);
 
         /* Params already validated, so we don't re-validate here */
 
@@ -170,7 +170,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
                 return_ACPI_STATUS(status);
         }
 
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "buffer_size_needed = %X\n",
+        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "BufferSizeNeeded = %X\n",
                           (u32) buffer_size_needed));
 
         /* Validate/Allocate/Clear caller buffer */
@@ -344,7 +344,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
                         user_prt->source_index = (u32) obj_desc->integer.value;
                 } else {
                         ACPI_ERROR((AE_INFO,
-                                    "(PRT[%X].source_index) Need Integer, found %s",
+                                    "(PRT[%X].SourceIndex) Need Integer, found %s",
                                     index,
                                     acpi_ut_get_object_type_name(obj_desc)));
                         return_ACPI_STATUS(AE_BAD_DATA);
@@ -355,7 +355,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
                 top_object_list++;
         }
 
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "output_buffer %p Length %X\n",
+        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "OutputBuffer %p Length %X\n",
                           output_buffer->pointer, (u32) output_buffer->length));
         return_ACPI_STATUS(AE_OK);
 }
@@ -385,9 +385,9 @@ acpi_rs_create_aml_resources(struct acpi_resource *linked_list_buffer,
         acpi_status status;
         acpi_size aml_size_needed = 0;
 
-        ACPI_FUNCTION_TRACE("rs_create_aml_resources");
+        ACPI_FUNCTION_TRACE(rs_create_aml_resources);
 
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "linked_list_buffer = %p\n",
+        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "LinkedListBuffer = %p\n",
                           linked_list_buffer));
 
         /*
@@ -398,7 +398,7 @@ acpi_rs_create_aml_resources(struct acpi_resource *linked_list_buffer,
          */
         status = acpi_rs_get_aml_length(linked_list_buffer, &aml_size_needed);
 
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "aml_size_needed=%X, %s\n",
+        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "AmlSizeNeeded=%X, %s\n",
                           (u32) aml_size_needed,
                           acpi_format_exception(status)));
         if (ACPI_FAILURE(status)) {
@@ -422,7 +422,7 @@ acpi_rs_create_aml_resources(struct acpi_resource *linked_list_buffer,
                 return_ACPI_STATUS(status);
         }
 
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "output_buffer %p Length %X\n",
+        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "OutputBuffer %p Length %X\n",
                           output_buffer->pointer, (u32) output_buffer->length));
         return_ACPI_STATUS(AE_OK);
 }
diff --git a/drivers/acpi/resources/rsdump.c b/drivers/acpi/resources/rsdump.c
index e7de061cf883..9c99a723a860 100644
--- a/drivers/acpi/resources/rsdump.c
+++ b/drivers/acpi/resources/rsdump.c
@@ -91,11 +91,11 @@ acpi_rs_dump_descriptor(void *resource, struct acpi_rsdump_info *table);
 struct acpi_rsdump_info acpi_rs_dump_irq[6] = {
         {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_irq), "IRQ", NULL},
         {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(irq.triggering), "Triggering",
-         acpi_gbl_HEdecode},
+         acpi_gbl_he_decode},
         {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(irq.polarity), "Polarity",
-         acpi_gbl_LLdecode},
+         acpi_gbl_ll_decode},
         {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(irq.sharable), "Sharing",
-         acpi_gbl_SHRdecode},
+         acpi_gbl_shr_decode},
         {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(irq.interrupt_count),
          "Interrupt Count", NULL},
         {ACPI_RSD_SHORTLIST, ACPI_RSD_OFFSET(irq.interrupts[0]),
@@ -105,11 +105,11 @@ struct acpi_rsdump_info acpi_rs_dump_irq[6] = {
 struct acpi_rsdump_info acpi_rs_dump_dma[6] = {
         {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_dma), "DMA", NULL},
         {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(dma.type), "Speed",
-         acpi_gbl_TYPdecode},
+         acpi_gbl_typ_decode},
         {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(dma.bus_master), "Mastering",
-         acpi_gbl_BMdecode},
+         acpi_gbl_bm_decode},
         {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(dma.transfer), "Transfer Type",
-         acpi_gbl_SIZdecode},
+         acpi_gbl_siz_decode},
         {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(dma.channel_count), "Channel Count",
          NULL},
         {ACPI_RSD_SHORTLIST, ACPI_RSD_OFFSET(dma.channels[0]), "Channel List",
@@ -158,7 +158,7 @@ struct acpi_rsdump_info acpi_rs_dump_vendor[3] = {
 };
 
 struct acpi_rsdump_info acpi_rs_dump_end_tag[1] = {
-        {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_end_tag), "end_tag",
+        {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_end_tag), "EndTag",
          NULL}
 };
 
@@ -166,7 +166,7 @@ struct acpi_rsdump_info acpi_rs_dump_memory24[6] = {
         {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_memory24),
          "24-Bit Memory Range", NULL},
         {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(memory24.write_protect),
-         "Write Protect", acpi_gbl_RWdecode},
+         "Write Protect", acpi_gbl_rw_decode},
         {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(memory24.minimum), "Address Minimum",
          NULL},
         {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(memory24.maximum), "Address Maximum",
@@ -181,7 +181,7 @@ struct acpi_rsdump_info acpi_rs_dump_memory32[6] = {
         {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_memory32),
          "32-Bit Memory Range", NULL},
         {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(memory32.write_protect),
-         "Write Protect", acpi_gbl_RWdecode},
+         "Write Protect", acpi_gbl_rw_decode},
         {ACPI_RSD_UINT32, ACPI_RSD_OFFSET(memory32.minimum), "Address Minimum",
          NULL},
         {ACPI_RSD_UINT32, ACPI_RSD_OFFSET(memory32.maximum), "Address Maximum",
@@ -196,7 +196,7 @@ struct acpi_rsdump_info acpi_rs_dump_fixed_memory32[4] = {
         {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_fixed_memory32),
          "32-Bit Fixed Memory Range", NULL},
         {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(fixed_memory32.write_protect),
-         "Write Protect", acpi_gbl_RWdecode},
+         "Write Protect", acpi_gbl_rw_decode},
         {ACPI_RSD_UINT32, ACPI_RSD_OFFSET(fixed_memory32.address), "Address",
          NULL},
         {ACPI_RSD_UINT32, ACPI_RSD_OFFSET(fixed_memory32.address_length),
@@ -278,11 +278,11 @@ struct acpi_rsdump_info acpi_rs_dump_ext_irq[8] = {
         {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(extended_irq.producer_consumer),
          "Type", acpi_gbl_consume_decode},
         {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(extended_irq.triggering),
-         "Triggering", acpi_gbl_HEdecode},
+         "Triggering", acpi_gbl_he_decode},
         {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(extended_irq.polarity), "Polarity",
-         acpi_gbl_LLdecode},
+         acpi_gbl_ll_decode},
         {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(extended_irq.sharable), "Sharing",
-         acpi_gbl_SHRdecode},
+         acpi_gbl_shr_decode},
         {ACPI_RSD_SOURCE, ACPI_RSD_OFFSET(extended_irq.resource_source), NULL,
          NULL},
         {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(extended_irq.interrupt_count),
@@ -314,7 +314,7 @@ static struct acpi_rsdump_info acpi_rs_dump_general_flags[5] = {
         {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(address.producer_consumer),
          "Consumer/Producer", acpi_gbl_consume_decode},
         {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(address.decode), "Address Decode",
-         acpi_gbl_DECdecode},
+         acpi_gbl_dec_decode},
         {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(address.min_address_fixed),
          "Min Relocatability", acpi_gbl_min_decode},
         {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(address.max_address_fixed),
@@ -325,24 +325,24 @@ static struct acpi_rsdump_info acpi_rs_dump_memory_flags[5] = {
         {ACPI_RSD_LITERAL, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_memory_flags),
          "Resource Type", (void *)"Memory Range"},
         {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(address.info.mem.write_protect),
-         "Write Protect", acpi_gbl_RWdecode},
+         "Write Protect", acpi_gbl_rw_decode},
         {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(address.info.mem.caching),
-         "Caching", acpi_gbl_MEMdecode},
+         "Caching", acpi_gbl_mem_decode},
         {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(address.info.mem.range_type),
-         "Range Type", acpi_gbl_MTPdecode},
+         "Range Type", acpi_gbl_mtp_decode},
         {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(address.info.mem.translation),
-         "Translation", acpi_gbl_TTPdecode}
+         "Translation", acpi_gbl_ttp_decode}
 };
 
 static struct acpi_rsdump_info acpi_rs_dump_io_flags[4] = {
         {ACPI_RSD_LITERAL, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_io_flags),
          "Resource Type", (void *)"I/O Range"},
         {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(address.info.io.range_type),
-         "Range Type", acpi_gbl_RNGdecode},
+         "Range Type", acpi_gbl_rng_decode},
         {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(address.info.io.translation),
-         "Translation", acpi_gbl_TTPdecode},
+         "Translation", acpi_gbl_ttp_decode},
         {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(address.info.io.translation_type),
-         "Translation Type", acpi_gbl_TRSdecode}
+         "Translation Type", acpi_gbl_trs_decode}
 };
 
 /*
diff --git a/drivers/acpi/resources/rslist.c b/drivers/acpi/resources/rslist.c
index 1b2d1e717e74..29423ce030ca 100644
--- a/drivers/acpi/resources/rslist.c
+++ b/drivers/acpi/resources/rslist.c
@@ -71,7 +71,7 @@ acpi_rs_convert_aml_to_resources(u8 * aml,
         struct acpi_resource *resource;
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE("rs_convert_aml_to_resources");
+        ACPI_FUNCTION_TRACE(rs_convert_aml_to_resources);
 
         /*
          * Check that the input buffer and all subsequent pointers into it
@@ -99,7 +99,7 @@ acpi_rs_convert_aml_to_resources(u8 * aml,
         }
 
         ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES,
-                          "Type %.2X, aml_length %.2X internal_length %.2X\n",
+                          "Type %.2X, AmlLength %.2X InternalLength %.2X\n",
                           acpi_ut_get_resource_type(aml), length,
                           resource->length));
 
@@ -136,7 +136,7 @@ acpi_rs_convert_resources_to_aml(struct acpi_resource *resource,
         u8 *end_aml = output_buffer + aml_size_needed;
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE("rs_convert_resources_to_aml");
+        ACPI_FUNCTION_TRACE(rs_convert_resources_to_aml);
 
         /* Walk the resource descriptor list, convert each descriptor */
 
diff --git a/drivers/acpi/resources/rsmisc.c b/drivers/acpi/resources/rsmisc.c
index 6a731f4028d4..faf6e106b785 100644
--- a/drivers/acpi/resources/rsmisc.c
+++ b/drivers/acpi/resources/rsmisc.c
@@ -81,7 +81,7 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,
         u16 item_count = 0;
         u16 temp16 = 0;
 
-        ACPI_FUNCTION_TRACE("rs_convert_aml_to_resource");
+        ACPI_FUNCTION_TRACE(rs_convert_aml_to_resource);
 
         if (((acpi_native_uint) resource) & 0x3) {
 
@@ -332,7 +332,7 @@ acpi_rs_convert_resource_to_aml(struct acpi_resource *resource,
         u16 temp16 = 0;
         u16 item_count = 0;
 
-        ACPI_FUNCTION_TRACE("rs_convert_resource_to_aml");
+        ACPI_FUNCTION_TRACE(rs_convert_resource_to_aml);
 
         /*
          * First table entry must be ACPI_RSC_INITxxx and must contain the
diff --git a/drivers/acpi/resources/rsutils.c b/drivers/acpi/resources/rsutils.c
index 9bcf0b637d22..aa98eebc9b78 100644
--- a/drivers/acpi/resources/rsutils.c
+++ b/drivers/acpi/resources/rsutils.c
@@ -461,7 +461,7 @@ acpi_rs_get_prt_method_data(acpi_handle handle, struct acpi_buffer * ret_buffer)
         union acpi_operand_object *obj_desc;
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE("rs_get_prt_method_data");
+        ACPI_FUNCTION_TRACE(rs_get_prt_method_data);
 
         /* Parameters guaranteed valid by caller */
 
@@ -509,7 +509,7 @@ acpi_rs_get_crs_method_data(acpi_handle handle, struct acpi_buffer *ret_buffer)
         union acpi_operand_object *obj_desc;
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE("rs_get_crs_method_data");
+        ACPI_FUNCTION_TRACE(rs_get_crs_method_data);
 
         /* Parameters guaranteed valid by caller */
 
@@ -559,7 +559,7 @@ acpi_rs_get_prs_method_data(acpi_handle handle, struct acpi_buffer *ret_buffer)
         union acpi_operand_object *obj_desc;
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE("rs_get_prs_method_data");
+        ACPI_FUNCTION_TRACE(rs_get_prs_method_data);
 
         /* Parameters guaranteed valid by caller */
 
@@ -611,7 +611,7 @@ acpi_rs_get_method_data(acpi_handle handle,
         union acpi_operand_object *obj_desc;
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE("rs_get_method_data");
+        ACPI_FUNCTION_TRACE(rs_get_method_data);
 
         /* Parameters guaranteed valid by caller */
 
@@ -662,7 +662,7 @@ acpi_rs_set_srs_method_data(acpi_handle handle, struct acpi_buffer *in_buffer)
         acpi_status status;
         struct acpi_buffer buffer;
 
-        ACPI_FUNCTION_TRACE("rs_set_srs_method_data");
+        ACPI_FUNCTION_TRACE(rs_set_srs_method_data);
 
         /* Parameters guaranteed valid by caller */
 
diff --git a/drivers/acpi/resources/rsxface.c b/drivers/acpi/resources/rsxface.c
index 1d00d285a5a3..8c1628c12cc8 100644
--- a/drivers/acpi/resources/rsxface.c
+++ b/drivers/acpi/resources/rsxface.c
@@ -95,7 +95,7 @@ acpi_get_irq_routing_table(acpi_handle device_handle,
 {
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE("acpi_get_irq_routing_table ");
+        ACPI_FUNCTION_TRACE(acpi_get_irq_routing_table);
 
         /*
          * Must have a valid handle and buffer, So we have to have a handle
@@ -147,7 +147,7 @@ acpi_get_current_resources(acpi_handle device_handle,
 {
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE("acpi_get_current_resources");
+        ACPI_FUNCTION_TRACE(acpi_get_current_resources);
 
         /*
          * Must have a valid handle and buffer, So we have to have a handle
@@ -197,7 +197,7 @@ acpi_get_possible_resources(acpi_handle device_handle,
 {
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE("acpi_get_possible_resources");
+        ACPI_FUNCTION_TRACE(acpi_get_possible_resources);
 
         /*
          * Must have a valid handle and buffer, So we have to have a handle
@@ -249,13 +249,13 @@ acpi_walk_resources(acpi_handle device_handle,
         struct acpi_resource *resource;
         struct acpi_resource *resource_end;
 
-        ACPI_FUNCTION_TRACE("acpi_walk_resources");
+        ACPI_FUNCTION_TRACE(acpi_walk_resources);
 
         /* Parameter validation */
 
         if (!device_handle || !user_function || !name ||
-            (ACPI_STRNCMP(name, METHOD_NAME__CRS, sizeof(METHOD_NAME__CRS)) &&
-             ACPI_STRNCMP(name, METHOD_NAME__PRS, sizeof(METHOD_NAME__PRS)))) {
+            (!ACPI_COMPARE_NAME(name, METHOD_NAME__CRS) &&
+             !ACPI_COMPARE_NAME(name, METHOD_NAME__PRS))) {
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
@@ -339,7 +339,7 @@ acpi_set_current_resources(acpi_handle device_handle,
 {
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE("acpi_set_current_resources");
+        ACPI_FUNCTION_TRACE(acpi_set_current_resources);
 
         /* Must have a valid handle and buffer */