3 files changed, 8 insertions, 46 deletions

diff --git a/drivers/acpi/dispatcher/dsmthdat.c b/drivers/acpi/dispatcher/dsmthdat.c
index f7998306f756..c83d53fd6398 100644
--- a/drivers/acpi/dispatcher/dsmthdat.c
+++ b/drivers/acpi/dispatcher/dsmthdat.c
@@ -633,22 +633,11 @@ acpi_ds_store_object_to_local (
                  */
                 if (opcode == AML_ARG_OP) {
                         /*
-                         * Make sure that the object is the correct type.  This may be
-                         * overkill, butit is here because references were NS nodes in
-                         *  the past.  Now they are operand objects of type Reference.
-                         */
-                        if (ACPI_GET_DESCRIPTOR_TYPE (current_obj_desc) != ACPI_DESC_TYPE_OPERAND) {
-                                ACPI_REPORT_ERROR ((
-                                        "Invalid descriptor type while storing to method arg: [%s]\n",
-                                        acpi_ut_get_descriptor_name (current_obj_desc)));
-                                return_ACPI_STATUS (AE_AML_INTERNAL);
-                        }
-
-                        /*
                          * If we have a valid reference object that came from ref_of(),
                          * do the indirect store
                          */
-                        if ((current_obj_desc->common.type == ACPI_TYPE_LOCAL_REFERENCE) &&
+                        if ((ACPI_GET_DESCRIPTOR_TYPE (current_obj_desc) == ACPI_DESC_TYPE_OPERAND) &&
+                                (current_obj_desc->common.type == ACPI_TYPE_LOCAL_REFERENCE) &&
                                 (current_obj_desc->reference.opcode == AML_REF_OF_OP)) {
                                 ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
                                                 "Arg (%p) is an obj_ref(Node), storing in node %p\n",
diff --git a/drivers/acpi/dispatcher/dswload.c b/drivers/acpi/dispatcher/dswload.c
index e2e0a855be2c..d2c603f54fd6 100644
--- a/drivers/acpi/dispatcher/dswload.c
+++ b/drivers/acpi/dispatcher/dswload.c
@@ -50,7 +50,7 @@
 #include <acpi/acnamesp.h>
 #include <acpi/acevents.h>
 
-#ifdef _ACPI_ASL_COMPILER
+#ifdef ACPI_ASL_COMPILER
 #include <acpi/acdisasm.h>
 #endif
 
@@ -176,7 +176,7 @@ acpi_ds_load1_begin_op (
                  */
                 status = acpi_ns_lookup (walk_state->scope_info, path, object_type,
                                   ACPI_IMODE_EXECUTE, ACPI_NS_SEARCH_PARENT, walk_state, &(node));
-#ifdef _ACPI_ASL_COMPILER
+#ifdef ACPI_ASL_COMPILER
                 if (status == AE_NOT_FOUND) {
                         /*
                          * Table disassembly:
@@ -569,7 +569,7 @@ acpi_ds_load2_begin_op (
                                   ACPI_IMODE_EXECUTE, ACPI_NS_SEARCH_PARENT,
                                   walk_state, &(node));
                 if (ACPI_FAILURE (status)) {
-#ifdef _ACPI_ASL_COMPILER
+#ifdef ACPI_ASL_COMPILER
                         if (status == AE_NOT_FOUND) {
                                 status = AE_OK;
                         }
diff --git a/drivers/acpi/dispatcher/dswstate.c b/drivers/acpi/dispatcher/dswstate.c
index cc45d52225d6..d360d8e89544 100644
--- a/drivers/acpi/dispatcher/dswstate.c
+++ b/drivers/acpi/dispatcher/dswstate.c
@@ -681,7 +681,7 @@ acpi_ds_create_walk_state (
         ACPI_FUNCTION_TRACE ("ds_create_walk_state");
 
 
-        walk_state = acpi_ut_acquire_from_cache (ACPI_MEM_LIST_WALK);
+        walk_state = ACPI_MEM_CALLOCATE (sizeof (struct acpi_walk_state));
         if (!walk_state) {
                 return_PTR (NULL);
         }
@@ -704,7 +704,7 @@ acpi_ds_create_walk_state (
 
         status = acpi_ds_result_stack_push (walk_state);
         if (ACPI_FAILURE (status)) {
-                acpi_ut_release_to_cache (ACPI_MEM_LIST_WALK, walk_state);
+                ACPI_MEM_FREE (walk_state);
                 return_PTR (NULL);
         }
 
@@ -900,38 +900,11 @@ acpi_ds_delete_walk_state (
                 acpi_ut_delete_generic_state (state);
         }
 
-        acpi_ut_release_to_cache (ACPI_MEM_LIST_WALK, walk_state);
+        ACPI_MEM_FREE (walk_state);
         return_VOID;
 }
 
 
-#ifdef ACPI_ENABLE_OBJECT_CACHE
-/******************************************************************************
- *
- * FUNCTION:    acpi_ds_delete_walk_state_cache
- *
- * PARAMETERS:  None
- *
- * RETURN:      None
- *
- * DESCRIPTION: Purge the global state object cache.  Used during subsystem
- *              termination.
- *
- ******************************************************************************/
-
-void
-acpi_ds_delete_walk_state_cache (
-        void)
-{
-        ACPI_FUNCTION_TRACE ("ds_delete_walk_state_cache");
-
-
-        acpi_ut_delete_generic_cache (ACPI_MEM_LIST_WALK);
-        return_VOID;
-}
-#endif
-
-
 #ifdef ACPI_OBSOLETE_FUNCTIONS
 /*******************************************************************************
  *