Commit 25d866c4 authored Jan 15, 2021 by Maximilian Luz Committed by Rafael J. Wysocki Jan 18, 2021

ACPICA: Clean up exception code class checks

ACPICA commit 5a8390fbd4c5c60da0b6d4ba53b5ee34fda9a0cb

With the exception code class check macros fixed in the previous
commit, let us now use those to simplify exception class checks
across ACPICA.

Link: https://github.com/acpica/acpica/commit/5a8390fb


Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Erik Kaneda <erik.kaneda@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

parent 3dfaea38

drivers/acpi/acpica/dbobject.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -47,7 +47,7 @@ acpi_db_dump_method_info(acpi_status status, struct acpi_walk_state *walk_state)

		/* Ignore control codes, they are not errors */

		if ((status & AE_CODE_MASK) == AE_CODE_CONTROL) {
		if (ACPI_CNTL_EXCEPTION(status)) {
		return;
		}

drivers/acpi/acpica/dsdebug.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -100,7 +100,7 @@ acpi_ds_dump_method_stack(acpi_status status,

		/* Ignore control codes, they are not errors */

		if ((status & AE_CODE_MASK) == AE_CODE_CONTROL) {
		if (ACPI_CNTL_EXCEPTION(status)) {
		return_VOID;
		}

drivers/acpi/acpica/psloop.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -264,8 +264,7 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
		ACPI_TO_POINTER
		(TRUE));
		if (ACPI_FAILURE(status)
		&& ((status & AE_CODE_MASK) !=
		AE_CODE_CONTROL)) {
		&& !ACPI_CNTL_EXCEPTION(status)) {
		if (status == AE_AML_NO_RETURN_VALUE) {
		ACPI_EXCEPTION((AE_INFO, status,
		"Invoked method did not return a value"));

drivers/acpi/acpica/psparse.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -383,7 +383,7 @@ acpi_ps_next_parse_state(struct acpi_walk_state *walk_state,
		default:

		status = callback_status;
		if ((callback_status & AE_CODE_MASK) == AE_CODE_CONTROL) {
		if (ACPI_CNTL_EXCEPTION(callback_status)) {
		status = AE_OK;
		}
		break;