diff options
Diffstat (limited to 'drivers/acpi/dispatcher/dswstate.c')
-rw-r--r-- | drivers/acpi/dispatcher/dswstate.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/acpi/dispatcher/dswstate.c b/drivers/acpi/dispatcher/dswstate.c index 5bc340b1b286..d2846ffc9773 100644 --- a/drivers/acpi/dispatcher/dswstate.c +++ b/drivers/acpi/dispatcher/dswstate.c | |||
@@ -66,7 +66,6 @@ void *acpi_ds_obj_stack_get_value(u32 index, | |||
66 | #endif | 66 | #endif |
67 | 67 | ||
68 | #ifdef ACPI_FUTURE_USAGE | 68 | #ifdef ACPI_FUTURE_USAGE |
69 | |||
70 | /******************************************************************************* | 69 | /******************************************************************************* |
71 | * | 70 | * |
72 | * FUNCTION: acpi_ds_result_remove | 71 | * FUNCTION: acpi_ds_result_remove |
@@ -128,7 +127,6 @@ acpi_ds_result_remove(union acpi_operand_object **object, | |||
128 | 127 | ||
129 | return (AE_OK); | 128 | return (AE_OK); |
130 | } | 129 | } |
131 | |||
132 | #endif /* ACPI_FUTURE_USAGE */ | 130 | #endif /* ACPI_FUTURE_USAGE */ |
133 | 131 | ||
134 | /******************************************************************************* | 132 | /******************************************************************************* |
@@ -645,7 +643,7 @@ struct acpi_walk_state *acpi_ds_create_walk_state(acpi_owner_id owner_id, | |||
645 | 643 | ||
646 | ACPI_FUNCTION_TRACE("ds_create_walk_state"); | 644 | ACPI_FUNCTION_TRACE("ds_create_walk_state"); |
647 | 645 | ||
648 | walk_state = ACPI_MEM_CALLOCATE(sizeof(struct acpi_walk_state)); | 646 | walk_state = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_walk_state)); |
649 | if (!walk_state) { | 647 | if (!walk_state) { |
650 | return_PTR(NULL); | 648 | return_PTR(NULL); |
651 | } | 649 | } |
@@ -668,7 +666,7 @@ struct acpi_walk_state *acpi_ds_create_walk_state(acpi_owner_id owner_id, | |||
668 | 666 | ||
669 | status = acpi_ds_result_stack_push(walk_state); | 667 | status = acpi_ds_result_stack_push(walk_state); |
670 | if (ACPI_FAILURE(status)) { | 668 | if (ACPI_FAILURE(status)) { |
671 | ACPI_MEM_FREE(walk_state); | 669 | ACPI_FREE(walk_state); |
672 | return_PTR(NULL); | 670 | return_PTR(NULL); |
673 | } | 671 | } |
674 | 672 | ||
@@ -859,7 +857,7 @@ void acpi_ds_delete_walk_state(struct acpi_walk_state *walk_state) | |||
859 | acpi_ut_delete_generic_state(state); | 857 | acpi_ut_delete_generic_state(state); |
860 | } | 858 | } |
861 | 859 | ||
862 | ACPI_MEM_FREE(walk_state); | 860 | ACPI_FREE(walk_state); |
863 | return_VOID; | 861 | return_VOID; |
864 | } | 862 | } |
865 | 863 | ||