forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-01-04 1543e317f1da31b75942316931e8f491a8920811
kernel/drivers/acpi/acpica/psobject.c
....@@ -3,7 +3,7 @@
33 *
44 * Module Name: psobject - Support for parse objects
55 *
6
- * Copyright (C) 2000 - 2018, Intel Corp.
6
+ * Copyright (C) 2000 - 2020, Intel Corp.
77 *
88 *****************************************************************************/
99
....@@ -481,8 +481,7 @@
481481 walk_state->opcode = (*op)->common.aml_opcode;
482482
483483 status = walk_state->ascending_callback(walk_state);
484
- status =
485
- acpi_ps_next_parse_state(walk_state, *op, status);
484
+ (void)acpi_ps_next_parse_state(walk_state, *op, status);
486485
487486 status2 = acpi_ps_complete_this_op(walk_state, *op);
488487 if (ACPI_FAILURE(status2)) {
....@@ -490,7 +489,6 @@
490489 }
491490 }
492491
493
- status = AE_OK;
494492 break;
495493
496494 case AE_CTRL_BREAK:
....@@ -512,14 +510,13 @@
512510 walk_state->opcode = (*op)->common.aml_opcode;
513511
514512 status = walk_state->ascending_callback(walk_state);
515
- status = acpi_ps_next_parse_state(walk_state, *op, status);
513
+ (void)acpi_ps_next_parse_state(walk_state, *op, status);
516514
517515 status2 = acpi_ps_complete_this_op(walk_state, *op);
518516 if (ACPI_FAILURE(status2)) {
519517 return_ACPI_STATUS(status2);
520518 }
521519
522
- status = AE_OK;
523520 break;
524521
525522 case AE_CTRL_TERMINATE:
....@@ -600,8 +597,7 @@
600597 * because there could be correct AML beyond the parts that caused
601598 * the runtime error.
602599 */
603
- ACPI_ERROR((AE_INFO,
604
- "Ignore error and continue table load"));
600
+ ACPI_INFO(("Ignoring error and continuing table load"));
605601 return_ACPI_STATUS(AE_OK);
606602 }
607603 return_ACPI_STATUS(status);