diff options
| author |   Erik Schmauss <erik.schmauss@intel.com> | 2018-03-14 16:13:05 -0700 |
|---|---|---|
| committer |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-03-18 18:52:00 +0100 |
| commit | 0fe0bebf5fb905ae682b1ecfd0b51b3a89e45ee6 (patch) | |
| tree | d466b2bbeca9fcf3c076605a253c2906b8a9d5f6 /drivers/acpi/acpica/tbinstal.c | |
| parent | ACPICA: Change a compile-time option to a runtime option (diff) | |
| download | linux-dev-0fe0bebf5fb905ae682b1ecfd0b51b3a89e45ee6.tar.xz linux-dev-0fe0bebf5fb905ae682b1ecfd0b51b3a89e45ee6.zip | |
ACPICA: macros: fix ACPI_ERROR_NAMESPACE macro
Fixing the ACPI_ERROR_NAMESPACE macros created an "unused variable"
compile error when ACPI_NO_ERROR_MESSAGES was defined. This commit
also fixes the above compilation errors by surrounding variables
meant for debugging inside a new ACPI_ERROR_ONLY macro.
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/tbinstal.c')
| -rw-r--r-- | drivers/acpi/acpica/tbinstal.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/acpica/tbinstal.c b/drivers/acpi/acpica/tbinstal.c index 00be16da1ee2..95693e407372 100644 --- a/drivers/acpi/acpica/tbinstal.c +++ b/drivers/acpi/acpica/tbinstal.c @@ -231,11 +231,11 @@ release_and_exit: void acpi_tb_override_table(struct acpi_table_desc *old_table_desc) { acpi_status status; - char *override_type; struct acpi_table_desc new_table_desc; struct acpi_table_header *table; acpi_physical_address address; u32 length; + ACPI_ERROR_ONLY(char *override_type); /* (1) Attempt logical override (returns a logical address) */ @@ -244,7 +244,7 @@ void acpi_tb_override_table(struct acpi_table_desc *old_table_desc) acpi_tb_acquire_temp_table(&new_table_desc, ACPI_PTR_TO_PHYSADDR(table), ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL); - override_type = "Logical"; + ACPI_ERROR_ONLY(override_type = "Logical"); goto finish_override; } @@ -255,7 +255,7 @@ void acpi_tb_override_table(struct acpi_table_desc *old_table_desc) if (ACPI_SUCCESS(status) && address && length) { acpi_tb_acquire_temp_table(&new_table_desc, address, ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL); - override_type = "Physical"; + ACPI_ERROR_ONLY(override_type = "Physical"); goto finish_override; } |