diff options
| author | Maximilian Luz <luzmaximilian@gmail.com> | 2021-01-15 10:48:19 -0800 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-01-18 16:01:10 +0100 |
| commit | 25d866c46c1d58083fa783703484f8473d61db54 (patch) | |
| tree | da454da193f7df2fa84e9b0a851a82cb2967e2ad /drivers/acpi/acpica | |
| parent | 3dfaea3811f8b6a89a347e8da9ab862cdf3e30fe (diff) | |
| download | linux-stable-25d866c46c1d58083fa783703484f8473d61db54.tar.gz linux-stable-25d866c46c1d58083fa783703484f8473d61db54.tar.bz2 linux-stable-25d866c46c1d58083fa783703484f8473d61db54.zip | |
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>
Diffstat (limited to 'drivers/acpi/acpica')
| -rw-r--r-- | drivers/acpi/acpica/dbobject.c | 2 | ||||
| -rw-r--r-- | drivers/acpi/acpica/dsdebug.c | 2 | ||||
| -rw-r--r-- | drivers/acpi/acpica/psloop.c | 3 | ||||
| -rw-r--r-- | drivers/acpi/acpica/psparse.c | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/drivers/acpi/acpica/dbobject.c b/drivers/acpi/acpica/dbobject.c index 4b4c530a0654..95ab91b35f29 100644 --- a/drivers/acpi/acpica/dbobject.c +++ b/drivers/acpi/acpica/dbobject.c @@ -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; } diff --git a/drivers/acpi/acpica/dsdebug.c b/drivers/acpi/acpica/dsdebug.c index 63bc5f19fb82..2c22e3eff535 100644 --- a/drivers/acpi/acpica/dsdebug.c +++ b/drivers/acpi/acpica/dsdebug.c @@ -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; } diff --git a/drivers/acpi/acpica/psloop.c b/drivers/acpi/acpica/psloop.c index 3cf0687b9915..1ba17cf16c41 100644 --- a/drivers/acpi/acpica/psloop.c +++ b/drivers/acpi/acpica/psloop.c @@ -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")); diff --git a/drivers/acpi/acpica/psparse.c b/drivers/acpi/acpica/psparse.c index bd3caf735be3..06490a137982 100644 --- a/drivers/acpi/acpica/psparse.c +++ b/drivers/acpi/acpica/psparse.c @@ -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; |