diff options
Diffstat (limited to 'drivers/acpi/namespace/nsxfeval.c')
| -rw-r--r-- | drivers/acpi/namespace/nsxfeval.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/drivers/acpi/namespace/nsxfeval.c b/drivers/acpi/namespace/nsxfeval.c index 8904d0fae6a2..be4f2899de74 100644 --- a/drivers/acpi/namespace/nsxfeval.c +++ b/drivers/acpi/namespace/nsxfeval.c | |||
| @@ -48,7 +48,6 @@ | |||
| 48 | 48 | ||
| 49 | #define _COMPONENT ACPI_NAMESPACE | 49 | #define _COMPONENT ACPI_NAMESPACE |
| 50 | ACPI_MODULE_NAME("nsxfeval") | 50 | ACPI_MODULE_NAME("nsxfeval") |
| 51 | |||
| 52 | #ifdef ACPI_FUTURE_USAGE | 51 | #ifdef ACPI_FUTURE_USAGE |
| 53 | /******************************************************************************* | 52 | /******************************************************************************* |
| 54 | * | 53 | * |
| @@ -73,8 +72,8 @@ ACPI_MODULE_NAME("nsxfeval") | |||
| 73 | acpi_status | 72 | acpi_status |
| 74 | acpi_evaluate_object_typed(acpi_handle handle, | 73 | acpi_evaluate_object_typed(acpi_handle handle, |
| 75 | acpi_string pathname, | 74 | acpi_string pathname, |
| 76 | struct acpi_object_list * external_params, | 75 | struct acpi_object_list *external_params, |
| 77 | struct acpi_buffer * return_buffer, | 76 | struct acpi_buffer *return_buffer, |
| 78 | acpi_object_type return_type) | 77 | acpi_object_type return_type) |
| 79 | { | 78 | { |
| 80 | acpi_status status; | 79 | acpi_status status; |
| @@ -143,7 +142,6 @@ acpi_evaluate_object_typed(acpi_handle handle, | |||
| 143 | 142 | ||
| 144 | ACPI_EXPORT_SYMBOL(acpi_evaluate_object_typed) | 143 | ACPI_EXPORT_SYMBOL(acpi_evaluate_object_typed) |
| 145 | #endif /* ACPI_FUTURE_USAGE */ | 144 | #endif /* ACPI_FUTURE_USAGE */ |
| 146 | |||
| 147 | /******************************************************************************* | 145 | /******************************************************************************* |
| 148 | * | 146 | * |
| 149 | * FUNCTION: acpi_evaluate_object | 147 | * FUNCTION: acpi_evaluate_object |
| @@ -170,7 +168,6 @@ acpi_evaluate_object(acpi_handle handle, | |||
| 170 | struct acpi_buffer *return_buffer) | 168 | struct acpi_buffer *return_buffer) |
| 171 | { | 169 | { |
| 172 | acpi_status status; | 170 | acpi_status status; |
| 173 | acpi_status status2; | ||
| 174 | struct acpi_evaluate_info *info; | 171 | struct acpi_evaluate_info *info; |
| 175 | acpi_size buffer_space_needed; | 172 | acpi_size buffer_space_needed; |
| 176 | u32 i; | 173 | u32 i; |
| @@ -329,14 +326,12 @@ acpi_evaluate_object(acpi_handle handle, | |||
| 329 | * Delete the internal return object. NOTE: Interpreter must be | 326 | * Delete the internal return object. NOTE: Interpreter must be |
| 330 | * locked to avoid race condition. | 327 | * locked to avoid race condition. |
| 331 | */ | 328 | */ |
| 332 | status2 = acpi_ex_enter_interpreter(); | 329 | acpi_ex_enter_interpreter(); |
| 333 | if (ACPI_SUCCESS(status2)) { | ||
| 334 | 330 | ||
| 335 | /* Remove one reference on the return object (should delete it) */ | 331 | /* Remove one reference on the return object (should delete it) */ |
| 336 | 332 | ||
| 337 | acpi_ut_remove_reference(info->return_object); | 333 | acpi_ut_remove_reference(info->return_object); |
| 338 | acpi_ex_exit_interpreter(); | 334 | acpi_ex_exit_interpreter(); |
| 339 | } | ||
| 340 | } | 335 | } |
| 341 | 336 | ||
| 342 | cleanup: | 337 | cleanup: |
