Revert "ACPICA: revert "acpi_serialize" changes"

This reverts commit a8f4af6dc6600980885c594f52eecd60edd62013.
Thus restoring ACPICA's new acpi_serialize code.

This commit by itself may cause a regression, but
it is reverted in this order so that subsequent
reverts reverts under this one can be made
without conflict.

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 4 insertions, 7 deletions

diff --git a/drivers/acpi/namespace/nsxfeval.c b/drivers/acpi/namespace/nsxfeval.c
index 8904d0fae6a2..7ac6ace50059 100644
--- a/drivers/acpi/namespace/nsxfeval.c
+++ b/drivers/acpi/namespace/nsxfeval.c
@@ -170,7 +170,6 @@ acpi_evaluate_object(acpi_handle handle,
                      struct acpi_buffer *return_buffer)
 {
         acpi_status status;
-        acpi_status status2;
         struct acpi_evaluate_info *info;
         acpi_size buffer_space_needed;
         u32 i;
@@ -329,14 +328,12 @@ acpi_evaluate_object(acpi_handle handle,
                  * Delete the internal return object. NOTE: Interpreter must be
                  * locked to avoid race condition.
                  */
-                status2 = acpi_ex_enter_interpreter();
-                if (ACPI_SUCCESS(status2)) {
+                acpi_ex_enter_interpreter();
 
-                        /* Remove one reference on the return object (should delete it) */
+                /* Remove one reference on the return object (should delete it) */
 
-                        acpi_ut_remove_reference(info->return_object);
-                        acpi_ex_exit_interpreter();
-                }
+                acpi_ut_remove_reference(info->return_object);
+                acpi_ex_exit_interpreter();
         }
 
       cleanup: