2 files changed, 1 insertions, 10 deletions

diff --git a/drivers/acpi/dispatcher/dsmethod.c b/drivers/acpi/dispatcher/dsmethod.c
index c50c0cd5d717..3db651c7f582 100644
--- a/drivers/acpi/dispatcher/dsmethod.c
+++ b/drivers/acpi/dispatcher/dsmethod.c
@@ -535,7 +535,6 @@ void
 acpi_ds_terminate_control_method(union acpi_operand_object *method_desc,
                                  struct acpi_walk_state *walk_state)
 {
-        struct acpi_namespace_node *method_node;
         acpi_status status;
 
         ACPI_FUNCTION_TRACE_PTR(ds_terminate_control_method, walk_state);
@@ -575,12 +574,6 @@ acpi_ds_terminate_control_method(union acpi_operand_object *method_desc,
 
         if (walk_state) {
                 /*
-                 * Delete any objects created by this method during execution.
-                 * The method Node is stored in the walk state
-                 */
-                method_node = walk_state->method_node;
-
-                /*
                  * Delete any namespace objects created anywhere within
                  * the namespace by the execution of this method
                  */
diff --git a/drivers/acpi/namespace/nswalk.c b/drivers/acpi/namespace/nswalk.c
index 280b8357c46c..c7b5409e2cf8 100644
--- a/drivers/acpi/namespace/nswalk.c
+++ b/drivers/acpi/namespace/nswalk.c
@@ -77,9 +77,7 @@ struct acpi_namespace_node *acpi_ns_get_next_node(acpi_object_type type, struct
 
                 /* It's really the parent's _scope_ that we want */
 
-                if (parent_node->child) {
-                        next_node = parent_node->child;
-                }
+                next_node = parent_node->child;
         }
 
         else {