X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Facpi%2Fdispatcher%2Fdswstate.c;h=81c6b46acda065b8f94785e2a82f41321fcfc42b;hb=6f71f83334a552167ccbbd42fe5dd979428c89e4;hp=5474776b63c1aef46f6fb7f07405d3f5d595a931;hpb=8d40237c730b8be87c1b80a5d96b9c603fefa829;p=linux-2.6.git

diff --git a/drivers/acpi/dispatcher/dswstate.c b/drivers/acpi/dispatcher/dswstate.c
index 5474776b6..81c6b46ac 100644
--- a/drivers/acpi/dispatcher/dswstate.c
+++ b/drivers/acpi/dispatcher/dswstate.c
@@ -51,8 +51,6 @@
 	 ACPI_MODULE_NAME    ("dswstate")
 
 
-#ifdef ACPI_FUTURE_USAGE
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ds_result_insert
@@ -176,8 +174,6 @@ acpi_ds_result_remove (
 	return (AE_OK);
 }
 
-#endif  /*  ACPI_FUTURE_USAGE  */
-
 
 /*******************************************************************************
  *
@@ -449,7 +445,7 @@ acpi_ds_result_stack_pop (
  *              Should be used with great care, if at all!
  *
  ******************************************************************************/
-#ifdef ACPI_FUTURE_USAGE
+
 acpi_status
 acpi_ds_obj_stack_delete_all (
 	struct acpi_walk_state          *walk_state)
@@ -471,7 +467,6 @@ acpi_ds_obj_stack_delete_all (
 
 	return_ACPI_STATUS (AE_OK);
 }
-#endif  /*  ACPI_FUTURE_USAGE  */
 
 
 /*******************************************************************************
@@ -692,7 +687,7 @@ acpi_ds_obj_stack_pop_and_delete (
  *              be within the range of the current stack pointer.
  *
  ******************************************************************************/
-#ifdef ACPI_FUTURE_USAGE
+
 void *
 acpi_ds_obj_stack_get_value (
 	u32                             index,
@@ -717,7 +712,6 @@ acpi_ds_obj_stack_get_value (
 	return_PTR (walk_state->operands[(acpi_native_uint)(walk_state->num_operands - 1) -
 			  index]);
 }
-#endif  /*  ACPI_FUTURE_USAGE  */
 
 
 /*******************************************************************************
@@ -873,7 +867,6 @@ 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);
 		return_PTR (NULL);
 	}