diff options
Diffstat (limited to 'drivers/acpi/dispatcher/dswstate.c')
-rw-r--r-- | drivers/acpi/dispatcher/dswstate.c | 33 |
1 files changed, 3 insertions, 30 deletions
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 ( | |||
681 | ACPI_FUNCTION_TRACE ("ds_create_walk_state"); | 681 | ACPI_FUNCTION_TRACE ("ds_create_walk_state"); |
682 | 682 | ||
683 | 683 | ||
684 | walk_state = acpi_ut_acquire_from_cache (ACPI_MEM_LIST_WALK); | 684 | walk_state = ACPI_MEM_CALLOCATE (sizeof (struct acpi_walk_state)); |
685 | if (!walk_state) { | 685 | if (!walk_state) { |
686 | return_PTR (NULL); | 686 | return_PTR (NULL); |
687 | } | 687 | } |
@@ -704,7 +704,7 @@ acpi_ds_create_walk_state ( | |||
704 | 704 | ||
705 | status = acpi_ds_result_stack_push (walk_state); | 705 | status = acpi_ds_result_stack_push (walk_state); |
706 | if (ACPI_FAILURE (status)) { | 706 | if (ACPI_FAILURE (status)) { |
707 | acpi_ut_release_to_cache (ACPI_MEM_LIST_WALK, walk_state); | 707 | ACPI_MEM_FREE (walk_state); |
708 | return_PTR (NULL); | 708 | return_PTR (NULL); |
709 | } | 709 | } |
710 | 710 | ||
@@ -900,38 +900,11 @@ acpi_ds_delete_walk_state ( | |||
900 | acpi_ut_delete_generic_state (state); | 900 | acpi_ut_delete_generic_state (state); |
901 | } | 901 | } |
902 | 902 | ||
903 | acpi_ut_release_to_cache (ACPI_MEM_LIST_WALK, walk_state); | 903 | ACPI_MEM_FREE (walk_state); |
904 | return_VOID; | 904 | return_VOID; |
905 | } | 905 | } |
906 | 906 | ||
907 | 907 | ||
908 | #ifdef ACPI_ENABLE_OBJECT_CACHE | ||
909 | /****************************************************************************** | ||
910 | * | ||
911 | * FUNCTION: acpi_ds_delete_walk_state_cache | ||
912 | * | ||
913 | * PARAMETERS: None | ||
914 | * | ||
915 | * RETURN: None | ||
916 | * | ||
917 | * DESCRIPTION: Purge the global state object cache. Used during subsystem | ||
918 | * termination. | ||
919 | * | ||
920 | ******************************************************************************/ | ||
921 | |||
922 | void | ||
923 | acpi_ds_delete_walk_state_cache ( | ||
924 | void) | ||
925 | { | ||
926 | ACPI_FUNCTION_TRACE ("ds_delete_walk_state_cache"); | ||
927 | |||
928 | |||
929 | acpi_ut_delete_generic_cache (ACPI_MEM_LIST_WALK); | ||
930 | return_VOID; | ||
931 | } | ||
932 | #endif | ||
933 | |||
934 | |||
935 | #ifdef ACPI_OBSOLETE_FUNCTIONS | 908 | #ifdef ACPI_OBSOLETE_FUNCTIONS |
936 | /******************************************************************************* | 909 | /******************************************************************************* |
937 | * | 910 | * |