ACPICA: Cleanup for internal Reference Object

Fix some sloppiness in the Reference object. No longer use AML
opcodes to differentiate the types, introduce new reference
Class. Cleanup the debug output code.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

2 files changed, 4 insertions, 8 deletions

diff --git a/drivers/acpi/namespace/nsdump.c b/drivers/acpi/namespace/nsdump.c
index 0ab22004728a..cc0ae39440e4 100644
--- a/drivers/acpi/namespace/nsdump.c
+++ b/drivers/acpi/namespace/nsdump.c
@@ -43,7 +43,6 @@
 
 #include <acpi/acpi.h>
 #include <acpi/acnamesp.h>
-#include <acpi/acparser.h>
 
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nsdump")
@@ -334,9 +333,7 @@ acpi_ns_dump_one_object(acpi_handle obj_handle,
                 case ACPI_TYPE_LOCAL_REFERENCE:
 
                         acpi_os_printf("[%s]\n",
-                                       acpi_ps_get_opcode_name(obj_desc->
-                                                               reference.
-                                                               opcode));
+                                       acpi_ut_get_reference_name(obj_desc));
                         break;
 
                 case ACPI_TYPE_BUFFER_FIELD:
diff --git a/drivers/acpi/namespace/nsxfeval.c b/drivers/acpi/namespace/nsxfeval.c
index f3cc37624537..a085cc39c055 100644
--- a/drivers/acpi/namespace/nsxfeval.c
+++ b/drivers/acpi/namespace/nsxfeval.c
@@ -45,7 +45,6 @@
 #include <acpi/acpi.h>
 #include <acpi/acnamesp.h>
 #include <acpi/acinterp.h>
-#include <acpi/amlcode.h>
 
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nsxfeval")
@@ -399,13 +398,13 @@ static void acpi_ns_resolve_references(struct acpi_evaluate_info *info)
          * (AML_LOAD_OP) cannot be dereferenced, nor can it be converted to
          * an union acpi_object.
          */
-        switch (info->return_object->reference.opcode) {
-        case AML_INDEX_OP:
+        switch (info->return_object->reference.class) {
+        case ACPI_REFCLASS_INDEX:
 
                 obj_desc = *(info->return_object->reference.where);
                 break;
 
-        case AML_REF_OF_OP:
+        case ACPI_REFCLASS_REFOF:
 
                 node = info->return_object->reference.object;
                 if (node) {