ACPI: ACPICA 20060421

[safe/jmp/linux-2.6] / drivers / acpi / tables / tbrsdt.c

diff --git a/drivers/acpi/tables/tbrsdt.c b/drivers/acpi/tables/tbrsdt.c
index 9e0ebe6..9e22643 100644 (file)
--- a/drivers/acpi/tables/tbrsdt.c
+++ b/drivers/acpi/tables/tbrsdt.c
@@ -64,7 +64,7 @@ acpi_status acpi_tb_verify_rsdp(struct acpi_pointer *address)
        acpi_status status;
        struct rsdp_descriptor *rsdp;
 
-       ACPI_FUNCTION_TRACE("tb_verify_rsdp");
+       ACPI_FUNCTION_TRACE(tb_verify_rsdp);
 
        switch (address->pointer_type) {
        case ACPI_LOGICAL_POINTER:
@@ -103,7 +103,7 @@ acpi_status acpi_tb_verify_rsdp(struct acpi_pointer *address)
 
        /* Save the table pointers and allocation info */
 
-       status = acpi_tb_init_table_descriptor(ACPI_TABLE_RSDP, &table_info);
+       status = acpi_tb_init_table_descriptor(ACPI_TABLE_ID_RSDP, &table_info);
        if (ACPI_FAILURE(status)) {
                goto cleanup;
        }
@@ -174,22 +174,19 @@ void acpi_tb_get_rsdt_address(struct acpi_pointer *out_address)
 
 acpi_status acpi_tb_validate_rsdt(struct acpi_table_header *table_ptr)
 {
-       int no_match;
+       char *signature;
 
        ACPI_FUNCTION_ENTRY();
 
-       /*
-        * Search for appropriate signature, RSDT or XSDT
-        */
+       /* Search for appropriate signature, RSDT or XSDT */
+
        if (acpi_gbl_root_table_type == ACPI_TABLE_TYPE_RSDT) {
-               no_match = ACPI_STRNCMP((char *)table_ptr, RSDT_SIG,
-                                       sizeof(RSDT_SIG) - 1);
+               signature = RSDT_SIG;
        } else {
-               no_match = ACPI_STRNCMP((char *)table_ptr, XSDT_SIG,
-                                       sizeof(XSDT_SIG) - 1);
+               signature = XSDT_SIG;
        }
 
-       if (no_match) {
+       if (!ACPI_COMPARE_NAME(table_ptr->signature, signature)) {
 
                /* Invalid RSDT or XSDT signature */
 
@@ -235,13 +232,13 @@ acpi_status acpi_tb_get_table_rsdt(void)
        acpi_status status;
        struct acpi_pointer address;
 
-       ACPI_FUNCTION_TRACE("tb_get_table_rsdt");
+       ACPI_FUNCTION_TRACE(tb_get_table_rsdt);
 
        /* Get the RSDT/XSDT via the RSDP */
 
        acpi_tb_get_rsdt_address(&address);
 
-       table_info.type = ACPI_TABLE_XSDT;
+       table_info.type = ACPI_TABLE_ID_XSDT;
        status = acpi_tb_get_table(&address, &table_info);
        if (ACPI_FAILURE(status)) {
                ACPI_EXCEPTION((AE_INFO, status,
@@ -275,7 +272,7 @@ acpi_status acpi_tb_get_table_rsdt(void)
 
        /* Save the table pointers and allocation info */
 
-       status = acpi_tb_init_table_descriptor(ACPI_TABLE_XSDT, &table_info);
+       status = acpi_tb_init_table_descriptor(ACPI_TABLE_ID_XSDT, &table_info);
        if (ACPI_FAILURE(status)) {
                return_ACPI_STATUS(status);
        }