diff options
| author | Bob Moore <robert.moore@intel.com> | 2019-10-25 23:36:51 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-10-28 22:12:46 +0100 |
| commit | aaf7566f33d2090128528a77bf92f948de76c817 (patch) | |
| tree | 85dafe9614143acf146ccef6f44b5b7aa3cd775b /drivers/acpi/acpica/psobject.c | |
| parent | ACPICA: Win OSL: Replace get_tick_count with get_tick_count64 (diff) | |
| download | linux-aaf7566f33d2090128528a77bf92f948de76c817.tar.xz linux-aaf7566f33d2090128528a77bf92f948de76c817.zip | |
ACPICA: More Clang changes
ACPICA commit 54b3aefb5de860306951c8c3339b1c37dcdf1b39
V8.0.1: Fixed all "dead assignment" warnings.
Link: https://github.com/acpica/acpica/commit/54b3aefb
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Erik Schmauss <erik.schmauss@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/acpica/psobject.c')
| -rw-r--r-- | drivers/acpi/acpica/psobject.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/acpi/acpica/psobject.c b/drivers/acpi/acpica/psobject.c index 9acf5f7453e9..ded2779fc8ea 100644 --- a/drivers/acpi/acpica/psobject.c +++ b/drivers/acpi/acpica/psobject.c @@ -480,7 +480,7 @@ acpi_ps_complete_op(struct acpi_walk_state *walk_state, acpi_ps_get_opcode_info((*op)->common.aml_opcode); walk_state->opcode = (*op)->common.aml_opcode; - (void)walk_state->ascending_callback(walk_state); + status = walk_state->ascending_callback(walk_state); (void)acpi_ps_next_parse_state(walk_state, *op, status); status2 = acpi_ps_complete_this_op(walk_state, *op); @@ -489,7 +489,6 @@ acpi_ps_complete_op(struct acpi_walk_state *walk_state, } } - status = AE_OK; break; case AE_CTRL_BREAK: @@ -511,14 +510,13 @@ acpi_ps_complete_op(struct acpi_walk_state *walk_state, walk_state->opcode = (*op)->common.aml_opcode; status = walk_state->ascending_callback(walk_state); - status = acpi_ps_next_parse_state(walk_state, *op, status); + (void)acpi_ps_next_parse_state(walk_state, *op, status); status2 = acpi_ps_complete_this_op(walk_state, *op); if (ACPI_FAILURE(status2)) { return_ACPI_STATUS(status2); } - status = AE_OK; break; case AE_CTRL_TERMINATE: |