Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / acpi / parser / psopcode.c

diff --git a/drivers/acpi/parser/psopcode.c b/drivers/acpi/parser/psopcode.c
index 229ae86afe8beb8cd7150f8b1518ec54d8e663c4..4bd25e32769f7443235d7831dbbb3aef1317f061 100644 (file)
--- a/drivers/acpi/parser/psopcode.c
+++ b/drivers/acpi/parser/psopcode.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -725,12 +725,13 @@ static const u8 acpi_gbl_long_op_index[NUM_EXTENDED_OPCODE] = {
 
 const struct acpi_opcode_info *acpi_ps_get_opcode_info(u16 opcode)
 {
-       ACPI_FUNCTION_NAME("ps_get_opcode_info");
+       ACPI_FUNCTION_NAME(ps_get_opcode_info);
 
        /*
         * Detect normal 8-bit opcode or extended 16-bit opcode
         */
        if (!(opcode & 0xFF00)) {
+
                /* Simple (8-bit) opcode: 0-255, can't index beyond table  */
 
                return (&acpi_gbl_aml_op_info
@@ -739,6 +740,7 @@ const struct acpi_opcode_info *acpi_ps_get_opcode_info(u16 opcode)
 
        if (((opcode & 0xFF00) == AML_EXTENDED_OPCODE) &&
            (((u8) opcode) <= MAX_EXTENDED_OPCODE)) {
+
                /* Valid extended (16-bit) opcode */
 
                return (&acpi_gbl_aml_op_info
@@ -747,7 +749,7 @@ const struct acpi_opcode_info *acpi_ps_get_opcode_info(u16 opcode)
 
        /* Unknown AML opcode */
 
-       ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+       ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
                          "Unknown AML opcode [%4.4X]\n", opcode));
 
        return (&acpi_gbl_aml_op_info[_UNK]);
@@ -779,7 +781,7 @@ char *acpi_ps_get_opcode_name(u16 opcode)
        return (op->name);
 
 #else
-       return ("AE_NOT_CONFIGURED");
+       return ("OpcodeName unavailable");
 
 #endif
 }